diff --git a/.cvsignore b/.cvsignore
index 83fd7ab..3a953de 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -102,3 +102,4 @@ libsepol-1.12.12.tgz
 libsepol-1.12.14.tgz
 libsepol-1.12.17.tgz
 libsepol-1.12.19.tgz
+libsepol-1.12.21.tgz
diff --git a/libsepol.spec b/libsepol.spec
index 6b11db1..1579090 100644
--- a/libsepol.spec
+++ b/libsepol.spec
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.19
-Release: 1.1
+Version: 1.12.21
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -37,6 +37,10 @@ needed for developing applications that manipulate binary policies.
 
 %prep
 %setup -q
+# sparc64 is an -fPIC arch, so we need to fix it here
+%ifarch sparc64
+sed -i 's/fpic/fPIC/g' src/Makefile
+%endif
 
 %build
 make clean
@@ -81,6 +85,12 @@ exit 0
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Aug 1 2006 Dan Walsh <dwalsh@redhat.com> 1.12.21-1
+- Upgrade to latest from NSA
+	* Merged helpful hierarchy check errors patch from Joshua Brindle.
+	* Merged semodule_deps patch from Karl MacMillan.
+	  This adds source module names to the avrule decls.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.12.19-1.1
 - rebuild
 
diff --git a/sources b/sources
index abc3ff8..f636941 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6526553bc469ddf37e0af1fe2864ceaf  libsepol-1.12.19.tgz
+f8fc9d63258fb867eabffc8e49d46506  libsepol-1.12.21.tgz