diff --git a/use-last-screen.patch b/use-last-screen.patch
index b1aa046..b9c07ca 100644
--- a/use-last-screen.patch
+++ b/use-last-screen.patch
@@ -42,7 +42,7 @@ index 5800700..b2fc8e3 100644
  	}
  	conf_screen = s;
  	from = X_CMDLINE;
-+    } else {
++    } else if (conf_screen) {
 +	/* Use the last Screen in the list */
 +	s = conf_screen;
 +	while (s->list.next)
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 8823ec3..bffba67 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan  3 06:35:03 UTC 2011 - sndirsch@novell.com
+
+- use-last-screen.patch
+  * adjusted the patch to no longer segfault the Xserver during
+    startup immediately when there isn't any screen section
+    specified at all (bnc #661989)
+
 -------------------------------------------------------------------
 Mon Dec 27 22:41:54 UTC 2010 - sndirsch@novell.com