diff --git a/app/errors.c b/app/errors.c
index 417e1e7068..406de17c76 100644
--- a/app/errors.c
+++ b/app/errors.c
@@ -86,8 +86,10 @@ errors_init (Gimp               *gimp,
     "Gimp-Dialogs",
     "Gimp-Display",
     "Gimp-File",
+    "Gimp-GEGL",
     "Gimp-GUI",
     "Gimp-Menus",
+    "Gimp-Operations",
     "Gimp-PDB",
     "Gimp-Paint",
     "Gimp-Paint-Funcs",
@@ -96,7 +98,14 @@ errors_init (Gimp               *gimp,
     "Gimp-Tools",
     "Gimp-Vectors",
     "Gimp-Widgets",
-    "Gimp-XCF"
+    "Gimp-XCF",
+    "LibGimpBase",
+    "LibGimpColor",
+    "LibGimpConfig",
+    "LibGimpMath",
+    "LibGimpModule",
+    "LibGimpThumb",
+    "LibGimpWidgets"
   };
   gint i;
 
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index e7b26fe893..f1b44d104f 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -491,15 +491,31 @@ gimp_main (const GimpPlugInInfo *info,
 
 
   /* set handler both for the "LibGimp" and "" domains */
+  {
+    const gchar * const log_domains[] =
+    {
+      "LibGimp",
+      "LibGimpBase",
+      "LibGimpColor",
+      "LibGimpConfig",
+      "LibGimpMath",
+      "LibGimpModule",
+      "LibGimpThumb",
+      "LibGimpWidgets"
+    };
+    gint i;
 
-  g_log_set_handler (G_LOG_DOMAIN,
-                     G_LOG_LEVEL_MESSAGE,
-                     gimp_message_func,
-                     NULL);
-  g_log_set_handler (NULL,
-                     G_LOG_LEVEL_MESSAGE,
-                     gimp_message_func,
-                     NULL);
+    for (i = 0; i < G_N_ELEMENTS (log_domains); i++)
+      g_log_set_handler (log_domains[i],
+                         G_LOG_LEVEL_MESSAGE,
+                         gimp_message_func,
+                         NULL);
+
+    g_log_set_handler (NULL,
+                       G_LOG_LEVEL_MESSAGE,
+                       gimp_message_func,
+                       NULL);
+  }
 
   if (gimp_debug_flags & GIMP_DEBUG_FATAL_WARNINGS)
     {