diff --git a/ChangeLog b/ChangeLog
index 3d9301cc2b..08952c5256 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+	* gdk/gdk.c (gdk_parse_args): call gdk_rgb_set_verbose(TRUE) if
+	"gdkrgb" is in the debug flags.
+
+	* gdk/gdkrgb.c (gdk_rgb_init): remove setting the verbose flag
+	here, this function is deprecated and the debug flag didn't work
+	when using GDK properly.
+
 2008-08-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkicontheme.c: Update to handle GEmblem.
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 969869ffd6..4bb73c2924 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -233,7 +233,10 @@ gdk_parse_args (int    *argc,
       g_error_free (error);
     }
   g_option_context_free (option_context);
-  
+
+  if (_gdk_debug_flags && GDK_DEBUG_GDKRGB)
+    gdk_rgb_set_verbose (TRUE);
+
   GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
 }
 
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 3d8470d8b5..cb138636ed 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -36,7 +36,6 @@
 
 #define ENABLE_GRAYSCALE
 
-#include "gdkprivate.h"
 #include "gdkinternals.h"	/* _gdk_windowing_get_bits_for_depth() */
 
 #include "gdkrgb.h"
@@ -678,9 +677,6 @@ gdk_rgb_init (void)
 {
   static const gint byte_order[1] = { 1 };
 
-  if (_gdk_debug_flags & GDK_DEBUG_GDKRGB)
-    gdk_rgb_verbose = TRUE;
-
   /* check endian sanity */
 #if G_BYTE_ORDER == G_BIG_ENDIAN
   if (((char *)byte_order)[0] == 1)