diff --git a/.cvsignore b/.cvsignore
index fa75bd8..f0fbf5e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-checkpolicy-1.15.2.tgz
+checkpolicy-1.15.4.tgz
diff --git a/checkpolicy-rhat.patch b/checkpolicy-rhat.patch
new file mode 100644
index 0000000..b60c25f
--- /dev/null
+++ b/checkpolicy-rhat.patch
@@ -0,0 +1,19 @@
+--- checkpolicy-1.15.4/Makefile.rhat	2004-08-11 15:58:53.000000000 -0400
++++ checkpolicy-1.15.4/Makefile	2004-08-12 10:55:15.424792648 -0400
+@@ -4,6 +4,7 @@
+ PREFIX ?= ${DESTDIR}/usr
+ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= $(PREFIX)/share/man
++LIBDIR ?= ${PREFIX}/lib
+ TARGETS = checkpolicy genpolusers 
+ 
+ # Set to y for MLS
+@@ -25,7 +26,7 @@
+ 
+ USEROBJS += users.tab.o lex.users.o queue.o genpolusers.o
+ 
+-LIBS=-lfl /usr/lib/libsepol.a
++LIBS=-lfl ${LIBDIR}/libsepol.a
+ 
+ all:  $(TARGETS)
+ 
diff --git a/checkpolicy.spec b/checkpolicy.spec
index a801206..907eb74 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,13 +1,15 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.15.2
-Release: 1
+Version: 1.15.4
+Release: 2
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/checkpolicy-%{version}.tgz
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
-BuildRequires: byacc flex
+BuildRequires: byacc flex libsepol-devel 
+Requires: libsepol 
+Patch: checkpolicy-rhat.patch
 
 %description
 Security-enhanced Linux is a patch of the Linux® kernel and a number
@@ -25,9 +27,10 @@ Only required for building policies.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
-make 
+make LIBDIR="%{_libdir}" 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -41,10 +44,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_bindir}/checkpolicy
 %{_bindir}/genpolusers
-
 %{_mandir}/man8/checkpolicy.8.gz
 
 %changelog
+* Wed Aug 11 2004 Dan Walsh <dwalsh@redhat.com> 1.15.4-1
+- Latest from NSA
+
+* Sat Aug 8 2004 Dan Walsh <dwalsh@redhat.com> 1.15.3-1
+- Latest from NSA
+
 * Wed Aug 4 2004 Dan Walsh <dwalsh@redhat.com> 1.15.2-1
 - Latest from NSA
 
diff --git a/sources b/sources
index 86cb422..6e53e11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-495249dc58c47b5cffd16462579cf12b  checkpolicy-1.15.2.tgz
+9eb054e6c996a2830e1797718c2e0610  checkpolicy-1.15.4.tgz