diff --git a/.cvsignore b/.cvsignore
index 8be59d5..cc7a32d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,4 @@ libselinux-1.19.4.tgz
 libselinux-1.20.1.tgz
 libselinux-1.21.1.tgz
 libselinux-1.21.2.tgz
+libselinux-1.21.4.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 637136a..2f6ac44 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,6 +1,6 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.21.2
+Version: 1.21.4
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -84,6 +84,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 28 2005 Dan Walsh <dwalsh@redhat.com> 1.21.4-1
+- Update from NSA
+	* Prevent overflow of spec array in matchpathcon.
+	* Fixed several uses of internal functions to avoid relocations.
+	* Changed rpm_execcon to check is_selinux_enabled() and fallback to
+	  a regular execve if not enabled (or unable to determine due to a lack
+	  of /proc, e.g. chroot'd environment).
+
 * Wed Jan 26 2005 Dan Walsh <dwalsh@redhat.com> 1.21.2-1
 - Update from NSA
 	* Merged minor fix for avcstat from Dan Walsh.
diff --git a/sources b/sources
index dfdf522..5811bbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c9f40b9628e7b221f67658e02a8387d  libselinux-1.21.2.tgz
+ad9fa7bbf47fb7f1b6521a008f906dca  libselinux-1.21.4.tgz