diff --git a/SPECS/xscreensaver.spec b/SPECS/xscreensaver.spec
index 892fa0e..6e1f6a0 100644
--- a/SPECS/xscreensaver.spec
+++ b/SPECS/xscreensaver.spec
@@ -1,6 +1,6 @@
 %define name          xscreensaver
 
-%define mainversion   5.39
+%define mainversion   5.40
 %define beta_ver      %{nil}
 
 
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    6
+%define fedora_rel    1
 
 %global use_clang_as_cc 0
 %global use_clang_analyze 0
@@ -77,22 +77,12 @@ Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
 Patch52:         xscreensaver-5.12-tests-miscfix.patch
 # 
-# Enable double buffer on cubestorm
-Patch3204:       xscreensaver-5.32-0004-cubestorm-enable-double-buffer-on-linux.patch
 # reset_strip: kill gcc7 -Wint-in-bool-context
 Patch3603:       xscreensaver-5.36-0003-reset_strip-kill-gcc7-Wint-in-bool-context.patch
 # init_crystal: kill gcc7 -Wint-in-bool-context
 Patch3604:       xscreensaver-5.36-0004-init_crystal-kill-gcc7-Wint-in-bool-context.patch
 # misc: kill gcc warn_unused_result warnings
 Patch3607:       xscreensaver-5.36-0007-misc-kill-gcc-warn_unused_result-warnings.patch
-# driver/Makefile.in: fix path for font-retry.o
-Patch3901:       xscreensaver-5.39-0001-driver-Makefile.in-fix-path-for-font-retry.o.patch
-# crumbler: fix color overvalue when accessing colors array
-Patch3902:       xscreensaver-5.39-0002-crumbler-fix-color-overvalue-when-accessing-colors-a.patch
-# crumbler: fix loop enclosure for calculating keys in split_chunk
-Patch3903:       xscreensaver-5.39-0003-crumbler-fix-loop-enclosure-for-calculating-keys-in-.patch
-# xscreensaver-getimage: avoid substitution to NULL pointer on GRAB_BARS mode
-Patch3904:       xscreensaver-5.39-0004-xscreensaver-getimage-avoid-substitution-to-NULL-poi.patch
 # 
 # Debugging patch
 # Not apply by default
@@ -367,14 +357,9 @@ find . -name \*.c -exec chmod ugo-x {} \;
 %patch52 -p1
   %__git commit -m "%PATCH52_desc" -a
 
-%__cat %PATCH3204 | %__git am
 %__cat %PATCH3603 | %__git am
 %__cat %PATCH3604 | %__git am
 #%%__cat %PATCH3607 | %__git am
-%__cat %PATCH3901 | %__git am
-%__cat %PATCH3902 | %__git am
-%__cat %PATCH3903 | %__git am
-%__cat %PATCH3904 | %__git am
 
 #%%__cat %PATCH13501 | %%__git am
 
@@ -1061,6 +1046,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 15 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.40-1
+- Update to 5.40
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.39-6.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Jun 20 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.39-6
 - xscreensaver-getimage: avoid substitution to NULL pointer on GRAB_BARS mode