diff --git a/.gitmodules b/.gitmodules
index f7d221e..f35361b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "loghogd/ext/groper"]
 	path = loghogd/ext/groper
 	url = https://github.com/ipartola/groper.git
+[submodule "loghogd/ext/croniter-upstream"]
+	path = loghogd/ext/croniter-upstream
+	url = git@github.com:taichino/croniter.git
diff --git a/debian/changelog b/debian/changelog
index 43b5417..9acdced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ loghogd (0.9) quantal; urgency=high
 
   * Bug fix: init script did not trigger proper facilities.conf reload
   * Updated sample config file with more sane defaults
+  * Switching to upstream version of croniter
 
  -- Igor Partola <igor@activefrequency.com>  Tue, 26 Mar 2013 15:42:11 -0400
 
diff --git a/loghogd/ext/croniter-upstream b/loghogd/ext/croniter-upstream
new file mode 160000
index 0000000..8685ea8
--- /dev/null
+++ b/loghogd/ext/croniter-upstream
@@ -0,0 +1 @@
+Subproject commit 8685ea8b2c819f5943f233be3246ff5eac06e4ae