diff --git a/.cvsignore b/.cvsignore
index 1ae21f5..ad03a42 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -95,3 +95,4 @@ policycoreutils-1.29.26.tgz
 policycoreutils-1.29.27.tgz
 policycoreutils-1.30.tgz
 policycoreutils-1.30.1.tgz
+policycoreutils-1.30.4.tgz
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 048c25c..36b4b3e 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -4,12 +4,11 @@
 %define libselinuxver 1.30-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.1
-Release: 4
+Version: 1.30.4
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} 
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -35,7 +34,6 @@ context.
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -107,7 +105,15 @@ rm -rf ${RPM_BUILD_ROOT}
 service restorecond condrestart
 
 %changelog
-* Tue Mar 21 2006 Dan Walsh <dwalsh@redhat.com> 1.30.1-4
+* Wed Mar 29 2006 Dan Walsh <dwalsh@redhat.com> 1.30.4-1
+- Update from upstream
+	* Merged audit2allow fixes for refpolicy from Dan Walsh.
+	* Merged fixfiles patch from Dan Walsh.
+	* Merged restorecond daemon from Dan Walsh.
+	* Merged semanage non-MLS fixes from Chris PeBenito.
+	* Merged semanage and semodule man page examples from Thomas Bleher.
+
+* Tue Mar 28 2006 Dan Walsh <dwalsh@redhat.com> 1.30.1-4
 - Clean up reference policy generation in audit2allow
 
 * Tue Mar 21 2006 Dan Walsh <dwalsh@redhat.com> 1.30.1-3
diff --git a/sources b/sources
index b673f14..56aa4d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1f4732b7c4d047a437d489b620a2895  policycoreutils-1.30.1.tgz
+4af18b5ace84c5cb075f5160ab51f86b  policycoreutils-1.30.4.tgz