diff --git a/ChangeLog b/ChangeLog
index e3bc0ddb248507e185628e5321f16721c01efd7a..217393d60f7aa89d609abf492a14c54846c59b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 CVS code -
 - faq.html:
 	- Fix typos and small mistakes (Jordi).
+- files.c:
+  cwd_tab_completion()
+	- removed skipping . and .. when tabulating matches.
 - nano.c:
   main()
 	- Reorder the getopt options to be more or less alphabetical
diff --git a/files.c b/files.c
index c39a482adea159679439dce7fa43b01231599160..870be700d75585b6980f2d319b3d8c01c0feb70a 100644
--- a/files.c
+++ b/files.c
@@ -807,11 +807,6 @@ char **cwd_tab_completion(char *buf, int *num_matches)
     }
     while ((next = readdir(dir)) != NULL) {
 
-	/* Some quick sanity checks */
-	if ((strcmp(next->d_name, "..") == 0)
-	    || (strcmp(next->d_name, ".") == 0)) {
-	    continue;
-	}
 #ifdef DEBUG
 	fprintf(stderr, "Comparing \'%s\'\n", next->d_name);
 #endif