diff --git a/xscreensaver-5.21-maze-restart.patch b/xscreensaver-5.21-maze-restart.patch
new file mode 100644
index 0000000..3074dd6
--- /dev/null
+++ b/xscreensaver-5.21-maze-restart.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.21/hacks/maze.c.restart	2012-06-10 17:41:55.000000000 +0900
++++ xscreensaver-5.21/hacks/maze.c	2013-05-30 19:15:50.248757217 +0900
+@@ -1587,6 +1587,8 @@ maze_draw (Display *dpy, Window window,
+         st->restart = 0;
+         st->stop = 0;
+         st->state = 1;
++        if (st->solve_state && st->solve_state->running)
++          st->solve_state->running = 0;
+ 
+         st->sync_p = ((random() % 4) != 0);
+ 
diff --git a/xscreensaver.spec b/xscreensaver.spec
index d44ea70..43f23be 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    6
+%define fedora_rel    7
 
 %undefine extrarel
 
@@ -74,6 +74,9 @@ Patch35:         xscreensaver-5.21-fireworkx-transit.patch
 Patch36:         xscreensaver-5.21-engine-onebytefix.patch
 # Fix segfault on pacman (bug 964575)
 Patch37:         xscreensaver-5.21-pacman-array-onebyte_ahead.patch
+# Reinitialize maze on restart, which will perhaps fix
+# maze segv
+Patch38:         xscreensaver-5.21-maze-restart.patch
 # driver/test-passwd tty segfaults
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -277,6 +280,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch35 -p1 -b .fireworkx.transit
 %patch36 -p1 -b .engine_onebyte
 %patch37 -p1 -b .pacman_onebyte
+%patch38 -p1 -b .maze_restart
 %patch51 -p1 -b .test_passwd
 %patch52 -p1 -b .test_misc
 %patch100 -p1 -b .rpmver
@@ -834,6 +838,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu May 30 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.21-7
+- Reinitialize maze on restart, which will perhaps fix
+  maze segv
+
 * Sun May 19 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:5.21-6
 - F-19+: Kill dependency for base on extras, gl-extras subpackage
 - Fix segfault on pacman (bug 964575)