diff --git a/ChangeLog b/ChangeLog
index 387d3579..76f206e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
 
-	* confifure.in: add a GCC flag check for -Wdeclaration-after-statement
+	* dbus/dbus-internals.c: unistd.h is not used 
+	(_dbus_verbose_real): only enable verbose printing 
+	if DBUS_VERBOSE environment var is set to '1'
+	(patch from Peter Kümmel <syntheticpp at gmx dot net>
+
+2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
+
+	* configure.in: add a GCC flag check for -Wdeclaration-after-statement
 	so we still compile on older gcc (patch from Frederic Peters 
 	<fpeters at 0d dot be>
 
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index b140da84..e2d01b11 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 
@@ -246,7 +245,8 @@ _dbus_verbose_real (const char *format,
   
   if (!verbose_initted)
     {
-      verbose = _dbus_getenv ("DBUS_VERBOSE") != NULL;
+      const char *p = _dbus_getenv ("DBUS_VERBOSE"); 
+      verbose = p != NULL && *p == '1';
       verbose_initted = TRUE;
       if (!verbose)
         return;