diff --git a/roles/nagios_server/files/selinux/Makefile b/roles/nagios_server/files/selinux/Makefile
new file mode 100644
index 0000000000..9f2c724098
--- /dev/null
+++ b/roles/nagios_server/files/selinux/Makefile
@@ -0,0 +1,4 @@
+module:
+	checkmodule -Mmo nagios_hostname.mod nagios_hostname.te
+	semodule_package -o nagios_hostname.pp -m nagios_hostname.mod
+	rm nagios_hostname.mod
diff --git a/roles/nagios_server/files/selinux/hostname.pp b/roles/nagios_server/files/selinux/hostname.pp
deleted file mode 100644
index 0db5752ea0..0000000000
Binary files a/roles/nagios_server/files/selinux/hostname.pp and /dev/null differ
diff --git a/roles/nagios_server/files/selinux/nagios_hostname.pp b/roles/nagios_server/files/selinux/nagios_hostname.pp
new file mode 100644
index 0000000000..4064cf79d8
Binary files /dev/null and b/roles/nagios_server/files/selinux/nagios_hostname.pp differ
diff --git a/roles/nagios_server/files/selinux/hostname.te b/roles/nagios_server/files/selinux/nagios_hostname.te
similarity index 89%
rename from roles/nagios_server/files/selinux/hostname.te
rename to roles/nagios_server/files/selinux/nagios_hostname.te
index db281e0abe..a8029f453a 100644
--- a/roles/nagios_server/files/selinux/hostname.te
+++ b/roles/nagios_server/files/selinux/nagios_hostname.te
@@ -1,5 +1,5 @@
 
-module hostname 1.0;
+module nagios_hostname 1.0;
 
 require {
 	type nagios_t;
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 5a078ba67a..07407ebe62 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -125,13 +125,13 @@
   - nagios_server
 
 - name: Copy over our custom selinux module
-  copy: src=selinux/hostname.pp dest=/usr/local/share/nagios-policy/hostname.pp
+  copy: src=selinux/nagios_hostname.pp dest=/usr/local/share/nagios-policy/nagios_hostname.pp
   register: selinux_module
   tags:
   - nagios_server
 
 - name: Install our custom selinux module
-  command: semodule -i /usr/local/share/nagios-policy/hostname.pp
+  command: semodule -i /usr/local/share/nagios-policy/nagios_hostname.pp
   when: selinux_module|changed
   tags:
   - nagios_server