diff --git a/.gitignore b/.gitignore
index a1ffd78..da646cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,3 +189,4 @@ libselinux-2.0.96.tgz
 /libselinux-2.1.5.tgz
 /libselinux-2.1.6.tgz
 /libselinux-2.1.7.tgz
+/libselinux-2.1.8.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 3c5d55c..2c5ee11 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -275,19 +275,3 @@ index 710396a..9a3fc14 100644
      hidden_proto(matchpathcon_init_prefix)
      hidden_proto(selinux_users_path)
      hidden_proto(selinux_usersconf_path);
-diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i
-index daf8314..359bd02 100644
---- a/libselinux/src/selinuxswig_python.i
-+++ b/libselinux/src/selinuxswig_python.i
-@@ -22,7 +22,10 @@ def restorecon(path, recursive=False):
-         status, context = matchpathcon(path, mode)
- 
-     if status == 0:
--        lsetfilecon(path, context)
-+        status, oldcontext = lgetfilecon(path)
-+        if context != oldcontext:
-+            lsetfilecon(path, context)
-+
-         if recursive:
-             os.path.walk(path, lambda arg, dirname, fnames:
-                              map(restorecon, [os.path.join(dirname, fname)
diff --git a/libselinux.spec b/libselinux.spec
index 0d2a9a5..392809d 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,13 +1,13 @@
 %global with_python3 1
 
 %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%define libsepolver 2.1.3-2
+%define libsepolver 2.1.4-1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.1.7
-Release: 2%{?dist}
+Version: 2.1.8
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -231,6 +231,22 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Dec 6 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.8-1
+- Upgrade to upstream
+	* selinuxswig_python.i: don't make syscall if it won't change anything
+	* Remove assert in security_get_boolean_names(3)
+	* Mapped compute functions now obey deny_unknown flag
+	* get_default_type now sets EINVAL if no entry.
+	* return EINVAL if invalid role selected
+	* Updated selabel_file(5) man page
+	* Updated selabel_db(5) man page
+	* Updated selabel_media(5) man page
+	* Updated selabel_x(5) man page
+	* Add man/man5 man pages
+	* Add man/man5 man pages
+	* Add man/man5 man pages
+	* use -W and -Werror in utils
+
 * Tue Nov 29 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.7-2
 - Change python binding for restorecon to check if the context matches.
 - If it does do not reset
diff --git a/sources b/sources
index ea0101d..0db36c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77352e66fff6d0a48b30dc851dc50f82  libselinux-2.1.7.tgz
+34aef25d990641380683f466b622cc4c  libselinux-2.1.8.tgz