diff --git a/ChangeLog b/ChangeLog
index 20ca93f8f8..dadfa5868a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,12 @@
 	Use src/sink pads lists for the respective iterators instead
 	of filtering.
 
+2005-10-10  Andy Wingo  <wingo@pobox.com>
+
+	* gst/gst.c (G_OPTION_FLAG_NO_ARG): Apparently GLib 2.8 requires
+	this flag, but it's not even in GLib 2.6. Odd. Hack around the
+	issue.
+
 2005-10-10  Andy Wingo  <wingo@pobox.com>
 
 	Merged in popt removal + GOption addition patch from Ronald, bug
diff --git a/gst/gst.c b/gst/gst.c
index d8960b8cfc..f6f79c1c43 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -237,6 +237,10 @@ parse_debug_list (const gchar * list)
   g_strfreev (split);
 }
 
+#ifndef GST_HAVE_GLIB_2_8
+#define G_OPTION_FLAG_NO_ARG 0
+#endif
+
 /**
  * gst_init_get_option_group:
  *