diff --git a/gdm-2.21.9-no-fatal-warnings.patch b/gdm-2.21.9-no-fatal-warnings.patch
deleted file mode 100644
index a6f282d..0000000
--- a/gdm-2.21.9-no-fatal-warnings.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gdm-2.31.90/common/gdm-common.c
-===================================================================
---- gdm-2.31.90.orig/common/gdm-common.c
-+++ gdm-2.31.90/common/gdm-common.c
-@@ -68,10 +68,12 @@ gdm_is_version_unstable (void)
- void
- gdm_set_fatal_warnings_if_unstable (void)
- {
-+#if 0
-         if (gdm_is_version_unstable ()) {
-                 g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
-                 g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-         }
-+#endif
- }
- 
- gboolean
diff --git a/gdm-is-not-unstable-unless.patch b/gdm-is-not-unstable-unless.patch
new file mode 100644
index 0000000..c5307c6
--- /dev/null
+++ b/gdm-is-not-unstable-unless.patch
@@ -0,0 +1,14 @@
+Index: gdm-2.31.92/common/gdm-common.c
+===================================================================
+--- gdm-2.31.92.orig/common/gdm-common.c
++++ gdm-2.31.92/common/gdm-common.c
+@@ -50,6 +50,9 @@ gdm_is_version_unstable (void)
+         char   **versions;
+         gboolean unstable;
+ 
++        if (!g_getenv ("SUSE_ENABLE_UNSTABLE_CHECK"))
++                return FALSE;
++
+         unstable = FALSE;
+ 
+         versions = g_strsplit (VERSION, ".", 3);
diff --git a/gdm.changes b/gdm.changes
index e32ddb6..bf6617f 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 22 14:26:23 CEST 2010 - vuntz@opensuse.org
+
+- Rename gdm-2.21.9-no-fatal-warnings.patch to
+  gdm-is-not-unstable-unless.patch, and change the behavior:
+  if the SUSE_ENABLE_UNSTABLE_CHECK environment variable is set, we
+  just do like upstream. If it is not set, we make GDM assume it's
+  not running a development version, which disables fatal warnings
+  and verbose logs.
+
 -------------------------------------------------------------------
 Thu Sep 16 09:55:10 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 7680bae..33873e0 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -51,8 +51,8 @@ Source2:        gdm-autologin.pamd
 Source3:        SuSEconfig.gdm
 # PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory, --with-consolekit-directory, --with-at-spi-registryd-directory
 Patch1:         gdm-helper-directory.patch
-# PATCH-FIX-OPENSUSE gdm-2.21.9-no-fatal-warnings.patch -- Do not accept fatal warnings in development version: gdm is too critical
-Patch2:         gdm-2.21.9-no-fatal-warnings.patch
+# PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log
+Patch2:         gdm-is-not-unstable-unless.patch
 # PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching
 Patch4:         gdm-vt-allocation-hack.patch
 # PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started