diff --git a/ChangeLog b/ChangeLog
index 1807baefe6..6286f7abe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes in version 0.2.1.1-alpha - 2008-??-??
   o Minor bugfixes:
     - Stop giving double-close warn when we reject an address for client DNS.
+    - On Windows, correctly detect errors when listing the contents of a
+      directory.  Fix from lodger.  (Bugfix on 0.1.2.x.)
 
   o Minor features:
     - Allow separate log levels to be configured for different logging
diff --git a/src/common/util.c b/src/common/util.c
index 669905dc03..764938ed9a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2096,7 +2096,7 @@ tor_listdir(const char *dirname)
   size_t pattern_len = strlen(dirname)+16;
   pattern = tor_malloc(pattern_len);
   tor_snprintf(pattern, pattern_len, "%s\\*", dirname);
-  if (!(handle = FindFirstFile(pattern, &findData))) {
+  if (INVALID_HANDLE_VALUE == (handle = FindFirstFile(pattern, &findData))) {
     tor_free(pattern);
     return NULL;
   }