diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 9bf1626..831c14e 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,6 +1,9 @@
 offlineimap (3.99.16) unstable; urgency=low
 
   * This is a 4.0 TRACK release, and may be unstable or in flux!
+  * When sep was /, the new Maildir support code would recursively try to 
+    scan ., resulting in huge paths and an eventual crash.  Fixed with
+    a one-line patch to Maildir.py.  Fixes [complete.org #60].
 
  -- John Goerzen <jgoerzen@complete.org>  Tue, 29 Apr 2003 08:10:17 -0500
 
diff --git a/offlineimap/head/offlineimap/repository/Maildir.py b/offlineimap/head/offlineimap/repository/Maildir.py
index 95efa44..a6c3056 100644
--- a/offlineimap/head/offlineimap/repository/Maildir.py
+++ b/offlineimap/head/offlineimap/repository/Maildir.py
@@ -132,7 +132,7 @@ class MaildirRepository(BaseRepository):
 
                 retval.append(folder.Maildir.MaildirFolder(self.root, foldername,
                                                            self.getsep(), self, self.accountname))
-            if self.getsep() == '/':
+            if self.getsep() == '/' and dirname != '.':
                 # Check sub-directories for folders.
                 retval.extend(self._getfolders_scandir(root, foldername))
         self.debug("_GETFOLDERS_SCANDIR RETURNING %s" % \