diff --git a/ChangeLog b/ChangeLog
index 0442ffb781..23b3c19380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-08  Sven Neumann  <sven@gimp.org>
+
+	* tools/gimp-remote.c: add the gtk+ options to the GOptionContext.
+
 2005-02-08  Sven Neumann  <sven@gimp.org>
 
 	* INSTALL: updated.
diff --git a/tools/gimp-remote.c b/tools/gimp-remote.c
index 5830f103e1..240829d6da 100644
--- a/tools/gimp-remote.c
+++ b/tools/gimp-remote.c
@@ -355,12 +355,7 @@ main (gint    argc,
   /* parse the command-line options */
   context = g_option_context_new ("[FILE|URI...]");
   g_option_context_add_main_entries (context, main_entries, NULL);
-
-#ifdef __GNUC__
-#warning FIXME: add this code as soon as we depend on gtk+-2.6
-#endif
-  /* g_option_context_add_group (context, gtk_get_option_group (TRUE));
-   */
+  g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
   if (! g_option_context_parse (context, &argc, &argv, &error))
     {