diff -u xscreensaver-5.07/debian/changelog xscreensaver-5.07/debian/changelog
--- xscreensaver-5.07/debian/changelog
+++ xscreensaver-5.07/debian/changelog
@@ -1,3 +1,9 @@
+xscreensaver (5.07-0ubuntu4) jaunty; urgency=low
+
+  * Included patch for Phosphor segfault (LP: #357556)
+
+ -- Timothy Pearson <kb9vqf@ubuntu.com>  Mon, 29 June 2009 12:07:00 -0600
+
 xscreensaver (5.07-0ubuntu3) intrepid; urgency=low
 
   * Drop xli | xloadimage recommends to universe. Both are in universe, and
diff -u xscreensaver-5.07/debian/patches/series xscreensaver-5.07/debian/patches/series
--- xscreensaver-5.07/debian/patches/series
+++ xscreensaver-5.07/debian/patches/series
@@ -24,4 +24,7 @@
 #60_add-ant-hack.patch
 
+# Fix random crashing in Phosphor
+61_fix-phosphor-segfault.patch
+
 # Maybe move upstream
 91_ubuntu-no-pam-conf.patch
only in patch2:
unchanged:
--- xscreensaver-5.07.orig/debian/patches/61_fix-phosphor-segfault.patch
+++ xscreensaver-5.07/debian/patches/61_fix-phosphor-segfault.patch
@@ -0,0 +1,19 @@
+--- xscreensaver-5.07/hacks/phosphor.c
++++ xscreensaver-5.07/hacks/phosphor.c
+@@ -1353,6 +1353,7 @@
+ 	  if (state->pid)
+ 	    {
+ 	      waitpid(state->pid, NULL, 0);
++              state->pid = 0;
+ 	      fclose (state->pipe);
+ 	    }
+ 	  else
+@@ -1436,7 +1437,7 @@
+   resize_grid (state);
+ 
+ # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
+-  if (state->pid)
++  if (state->pid && state->pipe)
+     {
+       /* Tell the sub-process that the screen size has changed. */
+       struct winsize ws;