diff --git a/modules-strict.conf b/modules-strict.conf
index 57a234cd..11b6b2ba 100644
--- a/modules-strict.conf
+++ b/modules-strict.conf
@@ -1354,3 +1354,10 @@ ricci = module
 # Abstract Machine Test Utility (AMTU)
 # 
 amtu = module
+
+# Layer: services
+# Module: zabbix
+#
+# Open-source monitoring solution for your IT infrastructure
+#
+zabbix = module
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 2c442a68..965745de 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1403,3 +1403,11 @@ tmpreaper = off
 # Abstract Machine Test Utility (AMTU)
 # 
 amtu = module
+
+# Layer: services
+# Module: zabbix
+#
+# Open-source monitoring solution for your IT infrastructure
+#
+zabbix = module
+
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 7fa24439..b21d066f 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,7 +17,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -356,7 +356,10 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
-* Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 2.5.8-1
+* Mon Mar 12 2007 Dan Walsh <dwalsh@redhat.com> 2.5.8-2
+- Fix handling of unlabled_t packets
+
+* Thu Mar 8 2007 Dan Walsh <dwalsh@redhat.com> 2.5.8-1
 - More of my patches from upstream
 
 * Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 2.5.7-1