diff --git a/.cvsignore b/.cvsignore
index f9c8fab..66f7335 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ policycoreutils-1.19.3.tgz
 policycoreutils-1.20.1.tgz
 policycoreutils-1.21.1.tgz
 policycoreutils-1.21.3.tgz
+policycoreutils-1.21.4.tgz
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 02cbec6..2f48da3 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,11 +1,10 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.21.3
-Release: 2
+Version: 1.21.1
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Patch: policycoreutils-rhat.patch
 
 Prefix: %{_prefix}
 BuildRequires: libselinux-devel >= 1.15.3 pam-devel libsepol-devel >= 1.1.1
@@ -32,7 +31,6 @@ context.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make CFLAGS="%{optflags}" all 
@@ -79,8 +77,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/run_init.8.gz
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
-
 %changelog
+* 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.
+
 * Fri Jan 20 2005 Dan Walsh <dwalsh@redhat.com> 1.21.3-2
 - Temp file needs to be created in /etc/selinux/POLICYTYPE/contexts/files/ directory.
 
diff --git a/sources b/sources
index 864692f..8eb12a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d2ef0ce3b9692e34ac489bf35aa625ff  policycoreutils-1.21.1.tgz
-0ac59d3c300ac05f1e48a26f50698e83  policycoreutils-1.21.3.tgz
+7a9c64861b368bfdba8785e697db2ce7  policycoreutils-1.21.4.tgz