diff --git a/.cvsignore b/.cvsignore
index cc7a32d..6804d89 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,3 +15,4 @@ libselinux-1.20.1.tgz
 libselinux-1.21.1.tgz
 libselinux-1.21.2.tgz
 libselinux-1.21.4.tgz
+libselinux-1.21.5.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 2f6ac44..83d7771 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,6 +1,6 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.21.4
+Version: 1.21.5
 Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -84,6 +84,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jan 31 2005 Dan Walsh <dwalsh@redhat.com> 1.21.5-1
+- Update from NSA
+	* Generalized matchpathcon internals, exported more interfaces,
+	  and moved additional code from setfiles into libselinux so that
+	  setfiles can directly use matchpathcon.
+
 * Fri Jan 28 2005 Dan Walsh <dwalsh@redhat.com> 1.21.4-1
 - Update from NSA
 	* Prevent overflow of spec array in matchpathcon.
diff --git a/sources b/sources
index 5811bbf..82cc68a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad9fa7bbf47fb7f1b6521a008f906dca  libselinux-1.21.4.tgz
+2413f5c86bbcdd38488d2222fb0aeb06  libselinux-1.21.5.tgz