diff --git a/.cvsignore b/.cvsignore
index 8104857..3c44675 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -65,3 +65,4 @@ serefpolicy-2.2.36.tgz
 serefpolicy-2.2.37.tgz
 serefpolicy-2.2.38.tgz
 serefpolicy-2.2.39.tgz
+serefpolicy-2.2.40.tgz
diff --git a/Makefile.devel b/Makefile.devel
index 3854849..f9dfdef 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -14,6 +14,6 @@ MCSFLAG=-mcs
 endif
 
 TYPE ?= $(NAME)${MCSFLAG}
-HEADERDIR := $(SHAREDIR)/targeted/include
+HEADERDIR := $(SHAREDIR)/devel/include
 include $(HEADERDIR)/Makefile
 
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 176a0e8..555d61e 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1079,3 +1079,10 @@ setrans = base
 # 
 openvpn = base
 
+# Layer: apps
+# Module: unconfined_execmem
+#
+# unconfined_execmem executable
+# 
+unconfined_execmem = base
+
diff --git a/selinux-policy.spec b/selinux-policy.spec
index b2acfd9..26e153d 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.39
-Release: 2
+Version: 2.2.40
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -335,6 +335,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Tue May 16 2006 Dan Walsh <dwalsh@redhat.com> 2.2.40-1
+- Update from upstream
+
 * Mon May 15 2006 Dan Walsh <dwalsh@redhat.com> 2.2.39-2
 - Fixes for amavis
 
diff --git a/sources b/sources
index eac0a21..a74707c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d69d9f74683900da61f56b4033490907  serefpolicy-2.2.39.tgz
+d2a0babbbb7cbf1d8bcb051d5972bb50  serefpolicy-2.2.40.tgz