diff --git a/src/ChangeLog b/src/ChangeLog
index 4cb560cc..543bfbc6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-23  Micah Cowan  <micah@cowan.name>
+
+	* utils.c (test_dir_matches_p): Added a test for the case
+	described in issue #20518.
+
 2008-04-22  Jim Paris  <jim@jtan.com>
 
 	* openssl.c (ssl_init): Enable combined certificate/key in
diff --git a/src/utils.c b/src/utils.c
index a4928dab..85a83355 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2205,6 +2205,8 @@ test_dir_matches_p()
     { { "*/*COMPLETE", NULL, NULL }, "foo/!COMPLETE", true },
     { { "/dir with spaces", NULL, NULL }, "dir with spaces", true },
     { { "/dir*with*spaces", NULL, NULL }, "dir with spaces", true },
+    { { "/Tmp/has", NULL, NULL }, "/Tmp/has space", false },
+    { { "/Tmp/has", NULL, NULL }, "/Tmp/has,comma", false },
   };
   
   for (i = 0; i < countof(test_array); ++i)