diff --git a/.cvsignore b/.cvsignore
index 1fcd840..16ed8c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -132,3 +132,4 @@ libselinux-2.0.34.tgz
 libselinux-2.0.35.tgz
 libselinux-2.0.36.tgz
 libselinux-2.0.37.tgz
+libselinux-2.0.40.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 6d258a6..b528709 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,7 +1,7 @@
 %define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.37
+Version: 2.0.40
 Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -123,6 +123,12 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Nov 6 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.40-1
+- Upgrade to upstream
+	* Merged refactored AVC netlink code from Eamon Walsh.
+	* Merged new X label namespaces from Eamon Walsh.
+	* Bux fix and minor refactoring in string representation code.
+
 * Fri Oct 5 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.37-1
 - Upgrade to upstream
 	* Merged selinux_get_callback, avc_open, empty string mapping from Eamon Walsh.
diff --git a/sources b/sources
index 9c9485d..f994faa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15d6162ff0d4f5b3ab75c4076935d59e  libselinux-2.0.37.tgz
+478d23ea92687e2f7d39e35f46a3afb1  libselinux-2.0.40.tgz