diff --git a/src/ChangeLog b/src/ChangeLog
index 8736644e..19cda90a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-15  Marcus Brinkmann  <mb@g10code.com>
+
+	* w32-util.c (_gpgme_w32ce_get_debug_envvar): Fix return value.
+
 2010-11-15  Werner Koch  <wk@g10code.com>
 
 	* data-compat.c (gpgme_data_new_from_filepart)
diff --git a/src/w32-util.c b/src/w32-util.c
index 50052dee..78578f9e 100644
--- a/src/w32-util.c
+++ b/src/w32-util.c
@@ -634,6 +634,6 @@ _gpgme_w32ce_get_debug_envvar (void)
       free (tmp);
       tmp = NULL;
     }
-  return NULL;
+  return tmp;
 }
 #endif /*HAVE_W32CE_SYSTEM*/