diff --git a/ChangeLog b/ChangeLog
index 4b4e22867c..4aeba67eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-01  Sven Neumann  <sven@gimp.org>
+
+	* app/config/gimpdisplayconfig.c
+	* app/widgets/gimpwidgets-utils.c (gimp_get_screen_resolution):
+	changed the default monitor resolution to 96 dpi and also use that
+	as a fallback value.
+
 2007-01-31  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpitem.c (gimp_item_parasite_detach): require "name"
diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
index f068da003e..72da9a28bc 100644
--- a/app/config/gimpdisplayconfig.c
+++ b/app/config/gimpdisplayconfig.c
@@ -37,8 +37,8 @@
 #include "gimp-intl.h"
 
 
-#define DEFAULT_ACTIVATE_ON_FOCUS TRUE
-
+#define DEFAULT_ACTIVATE_ON_FOCUS   TRUE
+#define DEFAULT_MONITOR_RESOLUTION  96.0
 
 enum
 {
@@ -181,12 +181,12 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
   GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_MONITOR_XRESOLUTION,
                                        "monitor-xresolution",
                                        MONITOR_XRESOLUTION_BLURB,
-                                       72.0,
+                                       DEFAULT_MONITOR_RESOLUTION,
                                        GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_MONITOR_YRESOLUTION,
                                        "monitor-yresolution",
                                        MONITOR_YRESOLUTION_BLURB,
-                                       72.0,
+                                       DEFAULT_MONITOR_RESOLUTION,
                                        GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MONITOR_RES_FROM_GDK,
                                     "monitor-resolution-from-windowing-system",
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index 2245846972..888d0c4da3 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -732,10 +732,10 @@ gimp_get_screen_resolution (GdkScreen *screen,
       y < GIMP_MIN_RESOLUTION || y > GIMP_MAX_RESOLUTION)
     {
       g_warning ("GDK returned bogus values for the screen resolution, "
-                 "using 75 dpi instead.");
+                 "using 96 dpi instead.");
 
-      x = 75.0;
-      y = 75.0;
+      x = 96.0;
+      y = 96.0;
     }
 
   /*  round the value to full integers to give more pleasant results  */