diff --git a/ChangeLog b/ChangeLog
index 5baf38370301477c16868dc98f49204576beb6f6..19548f6dbf1e5776a0b4ad1f4938f5655a4fba80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ version 0.9.5 -- unreleased
 	 . Fixed shell command quoting issues, missing 'then' clauses, cleaned up
 	   compress=yes to be less redundant and not create empty uncompressed
 	   file (Closes: #394935)
+	maildir:
+	 . Added an examples file (Closes: Trac#23)
         mysql:
 	 . Fixed case where odd combination of configuration options caused sqldump
 	   backups to get overwritten with an empty file (Closes: #402679)
diff --git a/handlers/maildir.in b/handlers/maildir.in
index 4b98debfbef9f26acbe82bd14ad1cd3587356b27..0d88e9271ef016702574c1295bd4005a9cf22069 100644
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -58,9 +58,6 @@ failedcount=0
 destdir=${destdir%/}
 srcdir=${srcdir%/}
 
-# used for testing
-#getconf testuser elijah
-
 [ -d $srcdir ] || fatal "source directory $srcdir doesn't exist"
 
 [ "$multiconnection" == "notset" ] && fatal "The maildir handler uses a very different destination format. See the example .maildir for more information"