diff --git a/ChangeLog b/ChangeLog
index 3f6b08151d..61a8e204e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-10  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gst.c: (gst_init_check_with_popt_table), (init_pre):
+	  Check whether GST_DEBUG_NO_COLOR environment variable is
+	  set and disable coloured debug output if that is the case.
+
 2005-08-10  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/base/gsttypefindhelper.c: (helper_find_peek),
diff --git a/gst/gst.c b/gst/gst.c
index 2a53ee33c2..bdd705d0a0 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -346,6 +346,10 @@ gst_init_check_with_popt_table (int *argc, char **argv[],
   context = poptGetContext ("GStreamer", *argc, (const char **) *argv,
       options, 0);
 
+  /* check for GST_DEBUG_NO_COLOR environment variable */
+  if (g_getenv ("GST_DEBUG_NO_COLOR") != NULL)
+    gst_debug_set_colored (FALSE);
+
   /* check for GST_DEBUG environment variable */
   gst_debug_env = g_getenv ("GST_DEBUG");
   if (gst_debug_env)
@@ -468,6 +472,9 @@ init_pre (void)
   {
     const gchar *debug_list;
 
+    if (g_getenv ("GST_DEBUG_NO_COLOR") != NULL)
+      gst_debug_set_colored (FALSE);
+
     debug_list = g_getenv ("GST_DEBUG");
     if (debug_list) {
       parse_debug_list (debug_list);