diff --git a/.cvsignore b/.cvsignore
index 6aeebf1..ba9a769 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,3 +21,4 @@ exclude
 nsapolicycoreutils
 policycoreutils-1.21.15.tgz
 policycoreutils-1.21.17.tgz
+policycoreutils-1.21.18.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index f74f6c6..0381b68 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,11 +1,14 @@
---- policycoreutils-1.21.17/scripts/fixfiles~	2005-02-17 19:16:10.000000000 -0500
-+++ policycoreutils-1.21.17/scripts/fixfiles	2005-02-17 19:20:14.000000000 -0500
-@@ -78,7 +78,7 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.18/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2005-02-08 13:27:03.000000000 -0500
++++ policycoreutils-1.21.18/scripts/fixfiles	2005-02-19 08:15:42.000000000 -0500
+@@ -78,8 +78,8 @@
                    esac; \
                 fi; \
              done | \
--	while read pattern ; do find $pattern -maxdepth 0 ! -fstype nfs ! -fstype tmpfs -print; done 2> /dev/null | \
-+	while read pattern ; do find $pattern -maxdepth 0 -fstype ext2 -fstype ext3 -fstype reiserfs -fstype xfs -print; done 2> /dev/null | \
- 	 ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
+-	while read pattern ; do find $pattern -maxdepth 0 -print; done 2> /dev/null | \
+-	 ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
++	while read pattern ; do find $pattern -fstype ext2 -fstype ext3 -fstype reiserfs -fstype xfs -print; done 2> /dev/null | \
++	 ${RESTORECON} $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
  	rm -f ${TEMPFILE}
  fi
+ }
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 7438985..a4ed49d 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -2,8 +2,8 @@
 %define libsepolver 1.3.5
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.21.17
-Release: 2
+Version: 1.21.18
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -82,6 +82,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Sat Feb 19 2005 Dan Walsh <dwalsh@redhat.com> 1.21.18-1
+- Update to latest from NSA
+	* Changed load_policy to fall back to the original policy upon
+	  an error from sepol_genusers().
+
 * Thu Feb 17 2005 Dan Walsh <dwalsh@redhat.com> 1.21.17-2
 - Only restorecon on ext[23], reiser and xfs
 
diff --git a/sources b/sources
index 8b90762..4543c20 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9ca78a2674a69bad77e8d4656f6dff43  policycoreutils-1.21.15.tgz
-f521f095156bc704c12273a0be26d6a8  policycoreutils-1.21.17.tgz
+c834874955d30715f224d1b275199da7  policycoreutils-1.21.18.tgz