diff --git a/.cvsignore b/.cvsignore
index a94b359..6168642 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,5 @@ libselinux-1.17.12.tgz
 libselinux-1.17.13.tgz
 libselinux-1.17.14.tgz
 libselinux-1.17.15.tgz
+libselinux-1.17.16.tgz
+libselinux-1.18.1.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 246007e..a266c56 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,19 +1,12 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.17.15
-Release: 3
+Version: 1.18.1
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libselinux-%{version}.tgz
 #Patch: libselinux-rhat.patch
-Patch1: libselinux-1.17.14-man.patch
-Patch2: libselinux-1.17.14-getconlist.patch
-Patch3: libselinux-1.17.14-getenforce.patch
-Patch4: libselinux-1.17.14-getsebool.patch
-Patch5: libselinux-1.17.14-matchpathcon.patch
-Patch6: libselinux-1.17.14-setenforce.patch
-Patch7: libselinux-1.17.14-setsebool.patch
-Patch8: libselinux-1.17.15-cleanup.patch
+Patch1: libselinux-1.18.1-cleanup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -42,15 +35,7 @@ needed for developing SELinux applications.
 
 %prep
 %setup -q
-#%patch -p1 -b .rhat
-%patch1 -p1 -b .manpage
-%patch2 -p1 -b .conlist
-%patch3 -p1 -b .getenf
-%patch4 -p1 -b .getsebool
-%patch5 -p1 -b .matchpath
-%patch6 -p1 -b .setenforce
-%patch7 -p1 -b .setsebool
-%patch8 -p1 -b .cleanup
+%patch1 -p1 -b .cleanup
 
 %build
 make CFLAGS="-g %{optflags}"
@@ -101,6 +86,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Tue Nov 2 2004 Dan Walsh <dwalsh@redhat.com> 1.18.1-1
+- Upgrade to latest from NSA
+
 * Thu Oct 28 2004 Steve Grubb <sgrubb@redhat.com> 1.17.15-2
 - Changed the location of the utilities to /usr/sbin since
    normal users can't use them anyways.
diff --git a/sources b/sources
index e29acf0..3be6c98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-322255db808bd732b420fd7197846542  libselinux-1.17.15.tgz
+805adbc9b42cbf0afbaf028587765c59  libselinux-1.18.1.tgz