diff --git a/.cvsignore b/.cvsignore
index fbe1c8e..7c22999 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -119,3 +119,4 @@ libselinux-2.0.12.tgz
 libselinux-2.0.13.tgz
 libselinux-2.0.14.tgz
 libselinux-2.0.16.tgz
+libselinux-2.0.18.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 8c26bbb..45b966d 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,7 +1,7 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.16
+Version: 2.0.18
 Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -121,6 +121,14 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Jun 1 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.18-1
+- Upgrade to upstream
+	* Merged patch to reduce size of libselinux and remove need for libsepol for embedded systems from Yuichi Nakamura.
+	  This patch also turns the link-time dependency on libsepol into a runtime (dlopen) dependency even in the non-embedded case.
+
+2.0.17 2007-05-31
+	* Updated Lindent script and reindented two header files.
+
 * Fri May 4 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.16-1
 - Upgrade to upstream
 	* Merged additional swig python bindings from Dan Walsh.
diff --git a/sources b/sources
index b1b13e6..7713cdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dd946578c8fd9bafca0274c0d5bbbdd  libselinux-2.0.16.tgz
+ce9a9eb68c5291a7302f61ff8b5f5cb4  libselinux-2.0.18.tgz