diff --git a/.cvsignore b/.cvsignore
index 66f7335..fd2ef09 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ policycoreutils-1.20.1.tgz
 policycoreutils-1.21.1.tgz
 policycoreutils-1.21.3.tgz
 policycoreutils-1.21.4.tgz
+policycoreutils-1.21.5.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index ec80953..94c9275 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,24 +1,12 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.1/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2005-01-24 11:19:10.103136000 -0500
-+++ policycoreutils-1.21.1/scripts/fixfiles	2005-01-24 11:19:28.998223000 -0500
-@@ -37,11 +37,19 @@
- SELINUXTYPE="targeted"
- if [ -e /etc/selinux/config ]; then
-     . /etc/selinux/config
--    FC=/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts
-+    FC=`mktemp /etc/selinux/${SELINUXTYPE}/contexts/files/file_context.XXXXXX`
-+    cat /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts.local > $FC 2> /dev/null
- else
-     FC=/etc/security/selinux/file_contexts
- fi
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.5/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2005-01-25 10:32:01.000000000 -0500
++++ policycoreutils-1.21.5/scripts/genhomedircon	2005-01-27 10:05:51.000000000 -0500
+@@ -96,7 +96,7 @@
+ 
+ 	rc=commands.getstatusoutput("grep -h '^UID_MIN' /etc/login.defs | sed -e 's/^UID_MIN[^0-9]*//'")
+ 	if rc[0] == 0:
+-		STARTING_UID=rc[1]
++		STARTING_UID=int(rc[1])
+ 	else:
+ 		STARTING_UID=500
  
-+cleanup() {
-+    if [ -e /etc/selinux/config -a -f "$FC" ]; then
-+	rm -f $FC
-+    fi
-+}
-+trap "cleanup" 0 1 2 3 13 15
-+
- #
- # Log to either syslog or a LOGFILE
- #
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 2f48da3..33d5de7 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,6 +1,6 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.21.1
+Version: 1.21.5
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -78,6 +78,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Thu Jan 27 2005 Dan Walsh <dwalsh@redhat.com> 1.21.5-1
+- Upgrade to latest from NSA
+	* Merged newrole -l support from Darrel Goeddel (TCS).
+- Fix genhomedircon STARTING_UID
+
 * Wed Jan 26 2005 Dan Walsh <dwalsh@redhat.com> 1.21.4-1
 - Upgrade to latest from NSA
 	* Merged fixfiles patch for file_contexts.local from Dan Walsh.
diff --git a/sources b/sources
index 8eb12a2..59b881a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a9c64861b368bfdba8785e697db2ce7  policycoreutils-1.21.4.tgz
+b16922f69bf5c3709df31304f7ee610a  policycoreutils-1.21.5.tgz