diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 5cd9617..2a5da76 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1595,8 +1595,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +relabel:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandbox	2010-05-27 13:53:57.000000000 -0400
-@@ -0,0 +1,426 @@
++++ policycoreutils-2.0.82/sandbox/sandbox	2010-06-03 11:03:16.000000000 -0400
+@@ -0,0 +1,427 @@
 +#! /usr/bin/python -E
 +# Authors: Dan Walsh <dwalsh@redhat.com>
 +# Authors: Josh Cogliati
@@ -1618,7 +1618,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 +#
 +
-+import os, sys, socket, random, fcntl, shutil, re, subprocess
++import os, stat, sys, socket, random, fcntl, shutil, re, subprocess
 +import selinux
 +import signal
 +from tempfile import mkdtemp
@@ -1666,11 +1666,12 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +def chcon(path, context, recursive=False):
 +    """ Restore SELinux context on a given path """
 +    mode = os.lstat(path)[stat.ST_MODE]
-+    lsetfilecon(path, context)
++    selinux.lsetfilecon(path, context)
 +    if recursive:
-+           os.path.walk(path, lambda arg, dirname, fnames:
-+                               map(chcon, [os.path.join(dirname, fname)
-+                                                for fname in fnames]), context)
++           for root, dirs, files in os.walk(path):
++                  for f in files:
++                         chcon("%s/%s" % (root, f), context, False)
++
 +def copyfile(file, dir, dest):
 +       import re
 +       if file.startswith(dir):
@@ -1949,7 +1950,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
 +                  self.__homedir = mkdtemp(dir=sandboxdir, prefix=".sandbox")
 +
 +           if self.__options.tmpdir:
-+                  chcon(self.__options.homedir, self.__filecon, True)
++                  chcon(self.__options.tmpdir, self.__filecon, True)
 +                  self.__tmpdir = self.__options.tmpdir
 +           else:
 +                  selinux.setfscreatecon(self.__filecon)
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 07ee6e4..04d5c15 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.82
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -142,7 +142,6 @@ The policycoreutils-python package contains the management tools use to manage a
 %{_mandir}/man1/audit2why.1*
 %{_mandir}/man8/chcat.8*
 %{_mandir}/ru/man8/chcat.8*
-%{_mandir}/man8/genhomedircon.8*
 %{_mandir}/man8/sandbox.8*
 %{_mandir}/man8/semanage.8*
 %{_mandir}/ru/man8/semanage.8*
@@ -294,6 +293,7 @@ rm -rf %{buildroot}
 %{_mandir}/man1/secon.1*
 %{_mandir}/ru/man1/secon.1*
 %{_mandir}/man8/seunshare.8*
+%{_mandir}/man8/genhomedircon.8*
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -313,6 +313,11 @@ fi
 exit 0
 
 %changelog
+* Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-27
+- Move genhomedircon.8 to same package as genhomedircon
+- Fix sandbox to pass unit test
+Resolves: #595796
+
 * Wed Jun 2 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-26
 - Fix listing of booleans from audit2allow
 
@@ -324,7 +329,6 @@ exit 0
 * Thu May 27 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-24
 - Man page fixes
 - sandbox fixes
-Resolves: #595796
 - Move seunshare to base package
 
 * Fri May 21 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-23