diff --git a/ChangeLog b/ChangeLog
index 709ec9e641..aba4e207e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-25  Sven Neumann  <sven@gimp.org>
+
+	* app/app.c
+	* app/gegl/gimp-gegl.c: reverted change from 2008-01-31. Use the
+	GEGL option group again now that GEGL provides some commmand-line
+	options.
+
 2008-04-25  Michael Natterer  <mitch@gimp.org>
 
 	* app/paint/gimppaintoptions.[ch]: reorder jitter options stuff to
diff --git a/app/app.c b/app/app.c
index 7c7df9b69f..eb166d4a29 100644
--- a/app/app.c
+++ b/app/app.c
@@ -32,6 +32,8 @@
 
 #include <gegl.h>
 
+#include <gegl.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
@@ -80,6 +82,8 @@ app_libs_init (GOptionContext *context,
 {
   g_type_init ();
 
+  g_option_context_add_group (context, gegl_get_option_group ());
+
 #ifndef GIMP_CONSOLE_COMPILATION
   if (! no_interface)
     {
diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c
index 47e09cc160..f1332abd2f 100644
--- a/app/gegl/gimp-gegl.c
+++ b/app/gegl/gimp-gegl.c
@@ -41,8 +41,6 @@
 void
 gimp_gegl_init (void)
 {
-  gegl_init (NULL, NULL);
-
   g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_BALANCE);
   g_type_class_ref (GIMP_TYPE_OPERATION_COLORIZE);
   g_type_class_ref (GIMP_TYPE_OPERATION_CURVES);