diff --git a/AUTHORS b/AUTHORS
index ef7ee3d37787a3564d8c2f6559ea38de95e40b06..30fcc5cac489b114ce47d06524139c9496809379 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,4 +33,5 @@ Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix
 Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo option
 stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
 maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
+Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
 
diff --git a/ChangeLog b/ChangeLog
index d2075024d78fc44ae7227329c12f04c3de5bf0c6..0b3149909d947beed4aef90a51555978f751c858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ version 0.9.7 -- UNRELEASED
 	 . add missing destid_file options to ssh connections
 	 . added sshoptions variable for arbitrary ssh options
 	 . updated example file to include destid_file, destport and sshoptions
+	 . use any subdirectories not just "a" to "z". Thanks Chris Nolan! (Redmine#606)
 	mysql:
 	 . Options passed to mysqldump are now customizable with the new
 	   sqldumpoptions configuration variable. Thanks to Chris Lamb for his