diff --git a/xscreensaver-5.08-randr-ncrtc-from-gentoo.patch b/xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
new file mode 100644
index 0000000..d25bebf
--- /dev/null
+++ b/xscreensaver-5.08-randr-ncrtc-from-gentoo.patch
@@ -0,0 +1,11 @@
+--- driver/screens.c.orig	2009-04-30 17:59:02.000000000 -0700
++++ driver/screens.c	2009-04-30 18:01:32.000000000 -0700
+@@ -436,7 +436,7 @@
+               XRROutputInfo *rroi = XRRGetOutputInfo (dpy, res, 
+                                                       res->outputs[k]);
+               RRCrtc crtc = (rroi->crtc  ? rroi->crtc :
+-                             rroi->crtcs ? rroi->crtcs[0] : 0);
++                             rroi->ncrtc ? rroi->crtcs[0] : 0);
+               XRRCrtcInfo *crtci = (crtc ? XRRGetCrtcInfo(dpy, res, crtc) : 0);
+ 
+               monitors[j] = m;
diff --git a/xscreensaver.spec b/xscreensaver.spec
index e2ee49e..0ca2f46 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    9
+%define fedora_rel    10
 
 %define extrarel      %{nil}
 
@@ -32,14 +32,21 @@ Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?b
 Source10:        update-xscreensaver-hacks
 %endif
 # bug 129335
+# sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 # Reported from upstream, sent upstream
+# pot file is not regenerated correctly
 Patch50:         xscreensaver-5.08-po-recreate.patch
 # bug 481146, sent upstream
+# phosphor crashes when resizing window
 Patch51:         xscreensaver-5.08-phosphor-segv.patch
+# bug 504912, must be reported to upstream
+# ref: gentoo http://bugs.gentoo.org/show_bug.cgi?id=249680
+# xscreensaver crashes when randr reportes 0 rroi->ncrtc
+Patch52:         xscreensaver-5.08-randr-ncrtc-from-gentoo.patch 
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -194,6 +201,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .po
 %patch51 -p1 -b .phosphor
+%patch52 -p0 -b .randr_ncrtc
 
 change_option(){
    set +x
@@ -644,6 +652,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jun 11 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.08-10
+- Fix crash on startup when randr reports no rroi->ncrtc
+  (bug 504912), patch from gentoo
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.08-9
 - F-11: Mass rebuild