diff --git a/roles/nagios/server/files/nagios-external/escalations.cfg b/roles/nagios/server/files/nagios-external/escalations.cfg
index f953d1ae3c..b36d920e44 100644
--- a/roles/nagios/server/files/nagios-external/escalations.cfg
+++ b/roles/nagios/server/files/nagios-external/escalations.cfg
@@ -12,6 +12,7 @@ define hostescalation{
 
 define serviceescalation{
 	host_name	*
+	description	*
 	contact_groups	fedora-sysadmin-email,fedora-sysadmin-emergency,fedora-sysadmin-ircbot
 	first_notification	2
 	last_notification	0
diff --git a/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
index abb93cad04..6c35adcc89 100644
--- a/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
+++ b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
@@ -78,12 +78,12 @@ define host {
   address                      152.19.134.169
 }
 
-define host {
-  host_name                    ibiblio05.fedoraproject.org
-  alias                        ibiblio05.fedoraproject.org
-  use                          defaulttemplate
-  address                      152.19.134.137
-}
+#define host {
+#  host_name                    ibiblio05.fedoraproject.org
+#  alias                        ibiblio05.fedoraproject.org
+#  use                          defaulttemplate
+#  address                      152.19.134.137
+#}
 
 #
 # ibiblio ipv6
diff --git a/roles/nagios/server/files/nagios-external/nagios.cfg b/roles/nagios/server/files/nagios-external/nagios.cfg
index 722b4284ea..66f7924ef6 100644
--- a/roles/nagios/server/files/nagios-external/nagios.cfg
+++ b/roles/nagios/server/files/nagios-external/nagios.cfg
@@ -170,27 +170,17 @@ command_file=/var/spool/nagios/cmd/nagios.cmd
 
 
 
-# COMMENT FILE
-# This is the file that Nagios will use for storing host and service
-# comments.
-
-comment_file=/var/log/nagios/comments.dat
-
-
-
-# DOWNTIME FILE
-# This is the file that Nagios will use for storing host and service
-# downtime data.
-
-downtime_file=/var/log/nagios/downtime.dat
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.
 
-lock_file=/var/run/nagios.pid
+lock_file=/var/run/nagios/nagios.pid
+
+
+# QUERY HANDLER INTERFACE
+# This is the socket that is created for the Query Handler interface
+
+query_socket=/var/spool/nagios/cmd/nagios.qh