diff --git a/.cvsignore b/.cvsignore
index 673fb90..4e03bae 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -111,3 +111,4 @@ libselinux-2.0.2.tgz
 libselinux-2.0.3.tgz
 libselinux-2.0.4.tgz
 libselinux-2.0.5.tgz
+libselinux-2.0.7.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index f8d82b5..8673863 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,19 +1,34 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getsebool.c libselinux-2.0.5/utils/getsebool.c
 --- nsalibselinux/utils/getsebool.c	2006-11-16 17:15:17.000000000 -0500
-+++ libselinux-2.0.5/utils/getsebool.c	2007-03-08 11:07:32.000000000 -0500
-@@ -75,14 +75,14 @@
- 			fprintf(stderr, "Error getting active value for %s\n",
- 				names[i]);
- 			rc = -1;
++++ libselinux-2.0.5/utils/getsebool.c	2007-03-09 13:22:43.000000000 -0500
+@@ -72,17 +72,23 @@
+ 	for (i = 0; i < len; i++) {
+ 		active = security_get_boolean_active(names[i]);
+ 		if (active < 0) {
+-			fprintf(stderr, "Error getting active value for %s\n",
+-				names[i]);
+-			rc = -1;
 -			goto out;
++			if (errno != EACCES) { 
++				fprintf(stderr, "Error getting active value for %s\n",
++					names[i]);
++				rc = -1;
++				goto out;
++			}
 +			continue;
  		}
  		pending = security_get_boolean_pending(names[i]);
  		if (pending < 0) {
- 			fprintf(stderr, "Error getting pending value for %s\n",
- 				names[i]);
- 			rc = -1;
+-			fprintf(stderr, "Error getting pending value for %s\n",
+-				names[i]);
+-			rc = -1;
 -			goto out;
++			if (errno != EACCES) { 
++				fprintf(stderr, "Error getting pending value for %s\n",
++					names[i]);
++				rc = -1;
++				goto out;
++			}
 +			continue;
  		}
  		if (pending != active) {
diff --git a/libselinux.spec b/libselinux.spec
index 01ed972..dcf0f50 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,8 +1,8 @@
 %define libsepolver 2.0.1-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.5
-Release: 2%{?dist}
+Version: 2.0.7
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -121,6 +121,11 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Mar 12 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.7-1
+	* Merged patch to drop support for CACHETRANS=0 config option from Steve Grubb.
+	* Merged patch to drop support for old /etc/sysconfig/selinux and
+	  /etc/security policy file layout from Steve Grubb.
+
 * Tue Mar 8 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.5-2
 - Do not fail on permission denied in getsebool
 
diff --git a/sources b/sources
index 5a64f36..aabab6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96d5d3f5832beec0a5ea5a4b7f7d552c  libselinux-2.0.5.tgz
+d701f23961a9630dcd850d02c566ddc9  libselinux-2.0.7.tgz