diff --git a/.gitignore b/.gitignore
index 7896552..849b749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /xscreensaver-5.18.tar.gz
 /xscreensaver-5.19.tar.gz
 /xscreensaver-5.20.tar.gz
+/xscreensaver-5.21.tar.gz
diff --git a/sources b/sources
index 67637e1..94a9e2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1faec61c61e29dc11f6ec9e4750ab877  xscreensaver-5.20.tar.gz
+1e9828ab7146d443c9d109cf2a1a4ed2  xscreensaver-5.21.tar.gz
diff --git a/xscreensaver-5.17-blurb-hndl-test-passwd.patch b/xscreensaver-5.17-blurb-hndl-test-passwd.patch
deleted file mode 100644
index d899062..0000000
--- a/xscreensaver-5.17-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xscreensaver-5.17/driver/test-passwd.c.hndl_extra	2011-09-25 09:16:56.000000000 +0900
-+++ xscreensaver-5.17/driver/test-passwd.c	2012-06-30 00:25:05.000000000 +0900
-@@ -66,6 +66,7 @@
- Bool update_screen_layout (saver_info *si) { return 0; }
- 
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
- 
- void
diff --git a/xscreensaver-5.19-check-largefile-support.patch b/xscreensaver-5.19-check-largefile-support.patch
deleted file mode 100644
index b2eaea3..0000000
--- a/xscreensaver-5.19-check-largefile-support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xscreensaver-5.19/configure.in.large	2012-07-01 07:50:43.000000000 +0900
-+++ xscreensaver-5.19/configure.in	2012-10-07 23:21:44.000000000 +0900
-@@ -1184,6 +1184,7 @@
- AC_HEADER_SYS_WAIT
- AC_HEADER_DIRENT
- AC_GETTIMEOFDAY_ARGS
-+AC_SYS_LARGEFILE
- AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
- AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
- AC_CHECK_FUNCS(setlocale)
diff --git a/xscreensaver-5.20-distort-configurenotify-startup.patch b/xscreensaver-5.20-distort-configurenotify-startup.patch
deleted file mode 100644
index ea47991..0000000
--- a/xscreensaver-5.20-distort-configurenotify-startup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xscreensaver-5.20/hacks/distort.c.configurenotify	2012-07-04 04:45:52.000000000 +0900
-+++ xscreensaver-5.20/hacks/distort.c	2012-10-30 23:31:56.000000000 +0900
-@@ -785,6 +785,9 @@
-   XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
-   /* XClearWindow (dpy, window); */
-   /* Why doesn't this work? */
-+  /* st->orig_map is created at distort_finish_loading and
-+     may not be initialized here */
-+  if (!st->orig_map) return;
-   XPutImage (st->dpy, st->window, st->gc, st->orig_map,
-              0, 0, st->orig_map->width, st->orig_map->height, 0, 0);
- }
diff --git a/xscreensaver-5.21-senescent_p-rpmver.patch b/xscreensaver-5.21-senescent_p-rpmver.patch
new file mode 100644
index 0000000..cc0caa7
--- /dev/null
+++ b/xscreensaver-5.21-senescent_p-rpmver.patch
@@ -0,0 +1,17 @@
+--- xscreensaver-5.21/driver/prefs.c.fedoraver	2013-02-04 07:34:08.000000000 +0900
++++ xscreensaver-5.21/driver/prefs.c	2013-02-07 12:52:31.894060303 +0900
+@@ -1663,6 +1663,14 @@ senescent_p (void)
+   int m, y, months;
+   s = strchr (screensaver_id, '-');
+   s++;
++/*
++    Fedora specific
++    Fedora changes screensaver_id to
++    "xscreensaver 5.21-1.fc19 (07-Feb-2013)", for example
++*/
++  s = strchr (s, '-');
++  s++;
++/*  Fedora specific end*/
+   strncpy (mon, s, 3);
+   s = strchr (s, '-');
+   s++;
diff --git a/xscreensaver.spec b/xscreensaver.spec
index c907104..78ca7c4 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.20
+%define mainversion   5.21
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    3
+%define fedora_rel    1
 
 %undefine extrarel
 
@@ -32,7 +32,7 @@ Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
+Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         MIT
 Group:           Amusements/Graphics
@@ -63,18 +63,13 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Prevent crash when distort receives ConfigureNotify at startup
-# (bug 871433)
-Patch33:         xscreensaver-5.20-distort-configurenotify-startup.patch
-# Add -D_FILE_OFFSET_BITS=64 when this enabled stat64
-Patch37:         xscreensaver-5.19-check-largefile-support.patch
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
 Patch42:         xscreensaver-5.12-tests-miscfix.patch
-# patch to compile driver/test-passwd.c with
-# xscreensaver-5.17-2 and above
-Patch43:         xscreensaver-5.17-blurb-hndl-test-passwd.patch
+# Fedora specific patch
+# senescent_p: Fedora changes screensaver_id
+Patch100:        xscreensaver-5.21-senescent_p-rpmver.patch
 # 
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -264,11 +259,9 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
-%patch33 -p1 -b .distort_startup
-%patch37 -p1 -b .large
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
-%patch43 -p1 -b .hndl_extra
+%patch100 -p1 -b .rpmver
 
 change_option(){
    set +x
@@ -820,6 +813,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Feb  7 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.21-1
+- Update to 5.21
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1:5.20-3.1
 - rebuild due to "jpeg8-ABI" feature drop