diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 1901611..6d00bae 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,19 +1,56 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.9/man/man8/matchpathcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.12/man/man8/matchpathcon.8
 --- nsalibselinux/man/man8/matchpathcon.8	2007-01-17 11:11:35.000000000 -0500
-+++ libselinux-2.0.9/man/man8/matchpathcon.8	2007-04-05 13:20:43.000000000 -0400
++++ libselinux-2.0.12/man/man8/matchpathcon.8	2007-04-12 12:29:25.000000000 -0400
 @@ -28,4 +28,4 @@
  
  .SH "SEE ALSO"
  .BR selinux "(8), "
 -.BR mathpathcon "(3), " 
 +.BR matchpathcon "(3), " 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.9/src/selinuxswig.i
+Binary files nsalibselinux/src/selinux.pyc and libselinux-2.0.12/src/selinux.pyc differ
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.12/src/selinuxswig.i
 --- nsalibselinux/src/selinuxswig.i	2007-02-22 08:53:23.000000000 -0500
-+++ libselinux-2.0.9/src/selinuxswig.i	2007-04-05 16:47:42.000000000 -0400
-@@ -115,9 +115,38 @@
++++ libselinux-2.0.12/src/selinuxswig.i	2007-04-12 12:39:51.000000000 -0400
+@@ -44,6 +44,8 @@
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
++extern void freecon(security_context_t con);
++extern void freeconary(security_context_t * con);
+ extern int getcon(security_context_t *con);
+ extern int setcon(security_context_t con);
+ extern int getpidcon(int pid, security_context_t *con);
+@@ -90,6 +92,11 @@
+ 			mode_t mode,
+ 			security_context_t *con);
+ 
++extern int matchpathcon_init_prefix(const char *path,
++				    const char *prefix);
++extern void matchpathcon_fini(void);
++
++
+ extern int matchmediacon(const char *media,
+ 		 security_context_t *con);
+ 
+@@ -106,6 +113,7 @@
+ extern const char *selinux_homedir_context_path(void);
+ extern const char *selinux_media_context_path(void);
+ extern const char *selinux_contexts_path(void);
++extern const char *selinux_securetty_types_path(void);
+ extern const char *selinux_booleans_path(void);
+ extern const char *selinux_customizable_types_path(void);
+ extern const char *selinux_users_path(void);
+@@ -113,11 +121,43 @@
+ extern const char *selinux_translations_path(void);
+ extern const char *selinux_netfilter_context_path(void);
  extern const char *selinux_path(void);
- extern int selinux_check_passwd_access(access_vector_t requested);
- extern int checkPasswdAccess(access_vector_t requested);
+-extern int selinux_check_passwd_access(access_vector_t requested);
+-extern int checkPasswdAccess(access_vector_t requested);
++#extern int selinux_check_passwd_access(access_vector_t requested);
++#extern int checkPasswdAccess(access_vector_t requested);
++
++extern int selinux_check_securetty_context(security_context_t tty_context);
++void set_selinuxmnt(char *mnt);
 +
 +// This tells SWIG to treat char ** as a special case
 +%typemap(python,in) char ** {
@@ -50,9 +87,17 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-
  
  extern int is_context_customizable (security_context_t scontext);
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.9/utils/getsebool.c
+@@ -135,3 +175,7 @@
+ }
+ extern int selinux_getpolicytype(char **enforce);
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
++
++int selinux_file_context_cmp(const security_context_t a, const security_context_t b);
++int selinux_file_context_verify(const char *path, mode_t mode);
++int selinux_lsetfilecon_default(const char *path);
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.12/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.9/utils/getsebool.c	2007-04-05 16:57:51.000000000 -0400
++++ libselinux-2.0.12/utils/getsebool.c	2007-04-12 12:29:25.000000000 -0400
 @@ -14,7 +14,7 @@
  
  int main(int argc, char **argv)
diff --git a/libselinux.spec b/libselinux.spec
index 1e7c7e7..c82096d 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,8 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Thu Apr 12 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.12-2
+
 * Wed Apr 11 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.12-1
 - Upgrade to upstream
 	* Merged support for getting initial contexts from James Carter.