diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index ff47987..6756a5b 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1700,7 +1700,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.78/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandbox	2010-01-14 13:44:46.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/sandbox	2010-01-19 11:58:50.000000000 -0500
 @@ -0,0 +1,323 @@
 +#! /usr/bin/python -E
 +# Authors: Dan Walsh <dwalsh@redhat.com>
@@ -1978,7 +1978,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +                         if X_ind:
 +                                xmodmapfile = newhomedir + "/.xmodmap"
 +                                xd = open(xmodmapfile,"w")
-+                                subprocess.Popen(["/usr/bin/xmodmap","-pke"],stdout=xd.wait()
++                                subprocess.Popen(["/usr/bin/xmodmap","-pke"],stdout=xd).wait()
 +                                xd.close()
 +
 +                                execfile = newhomedir + "/.sandboxrc"
@@ -2081,11 +2081,13 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +.PP
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.78/sandbox/sandboxX.sh
 --- nsapolicycoreutils/sandbox/sandboxX.sh	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/sandboxX.sh	2010-01-14 13:42:00.000000000 -0500
-@@ -0,0 +1,16 @@
++++ policycoreutils-2.0.78/sandbox/sandboxX.sh	2010-01-19 12:20:41.000000000 -0500
+@@ -0,0 +1,19 @@
 +#!/bin/bash 
 +export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
 +
++trap "exit 0" HUP
++
 +(/usr/bin/Xephyr -title "$TITLE" -terminate -screen 1000x700 -displayfd 5 5>&1 2>/dev/null) | while read D; do 
 +    export DISPLAY=:$D
 +    (/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap) &
@@ -2095,13 +2097,14 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +    CLIENT_PID=$!
 +    wait $CLIENT_PID
 +    export EXITCODE=$?
-+    kill -TERM $WM_PID
++    kill -TERM $WM_PID  2> /dev/null
 +    kill -HUP 0
 +    break
 +done
++exit 0
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.78/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/sandbox/seunshare.c	2009-12-08 17:05:49.000000000 -0500
++++ policycoreutils-2.0.78/sandbox/seunshare.c	2010-01-19 12:15:41.000000000 -0500
 @@ -0,0 +1,265 @@
 +#include <signal.h>
 +#include <sys/types.h>
diff --git a/policycoreutils.spec b/policycoreutils.spec
index dc49258..e0f8c67 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -297,6 +297,10 @@ fi
 exit 0
 
 %changelog
+* Thu Jan 14 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-12
+- Fix patch xod xmodmap
+- Exit 0 from script
+ 
 * Thu Jan 14 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-11
 - Run with the same xdmodmap in sandbox as outside
 - Patch from Josh Cogliati