diff --git a/.cvsignore b/.cvsignore
index dec3565..05f8df3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ serefpolicy-2.0.1.tgz
 serefpolicy-2.0.2.tgz
 serefpolicy-2.0.3.tgz
 serefpolicy-2.0.4.tgz
+serefpolicy-2.0.5.tgz
diff --git a/selinux-policy.spec b/selinux-policy.spec
index a8b75b1..de28c95 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -51,10 +51,10 @@ make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} 
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=y DESTDIR=$RPM_BUILD_ROOT install-appconfig \
+semodule_expand $RPM_BUILD_ROOT/usr/share/selinux/%1/base.pp $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
-touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
@@ -76,7 +76,7 @@ install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}
 %dir %{_sysconfdir}/selinux/%1/modules/active \
 %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
 %dir %{_sysconfdir}/selinux/%1/policy/ \
-%ghost %{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
+%verify(not md5 size mtime) %config(noreplace)%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 %dir %{_sysconfdir}/selinux/%1/contexts \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/customizable_types \
 %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/dbus_contexts \
@@ -104,7 +104,8 @@ semodule -b /usr/share/selinux/%1/base.pp -s %1 \
 for file in $(ls /usr/share/selinux/%1 | grep -v base.pp) \
 do \
 	semodule -i /usr/share/selinux/%1/$file -s %1;\
-done; 
+done; \
+rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
 
 %define relabel() \
 . %{_sysconfdir}/selinux/config; \
diff --git a/sources b/sources
index eb48f74..0588084 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0cb311588a711633a0a143b01d14a5a  serefpolicy-2.0.4.tgz
+e8e4dbc74890028600c94e0d32b1de7d  serefpolicy-2.0.5.tgz