diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg
new file mode 100644
index 0000000000..8c13d17af9
--- /dev/null
+++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg
@@ -0,0 +1,5 @@
+define contactgroup{
+        contactgroup_name       fedora-sysadmin-ircbot
+        alias                   Fedora Sysadmin irc Contacts
+	members ircbot
+        }
diff --git a/roles/nagios_server/files/nagios/contacts/ircbot.cfg b/roles/nagios_server/files/nagios/contacts/ircbot.cfg
new file mode 100644
index 0000000000..9f3d4fee2e
--- /dev/null
+++ b/roles/nagios_server/files/nagios/contacts/ircbot.cfg
@@ -0,0 +1,10 @@
+define contact{
+    contact_name        ircbot
+    alias           ZOD
+    service_notification_period     24x7
+    host_notification_period        24x7
+    service_notification_options    w,u,c,r
+    host_notification_options       d,u,r
+    service_notification_commands   notify-by-ircbot
+    host_notification_commands      host-notify-by-ircbot
+}
diff --git a/roles/nagios_server/files/nagios/contacts/ricky.cfg b/roles/nagios_server/files/nagios/contacts/ricky.cfg
index 56a23367e4..615f839b42 100644
--- a/roles/nagios_server/files/nagios/contacts/ricky.cfg
+++ b/roles/nagios_server/files/nagios/contacts/ricky.cfg
@@ -5,8 +5,8 @@ define contact{
     host_notification_period        24x7
     service_notification_options    w,u,c,r
     host_notification_options       d,u,r
-    service_notification_commands   notify-by-email,notify-by-ircbot
-    host_notification_commands      host-notify-by-email,host-notify-by-ircbot
+    service_notification_commands   notify-by-email
+    host_notification_commands      host-notify-by-email
     email                           ricky@rzhou.org
 }
 
diff --git a/roles/nagios_server/files/nagios/escalations.cfg b/roles/nagios_server/files/nagios/escalations.cfg
new file mode 100644
index 0000000000..2ceb7fb760
--- /dev/null
+++ b/roles/nagios_server/files/nagios/escalations.cfg
@@ -0,0 +1,22 @@
+define hostescalation{
+	host_name	*
+	hostgroup_name	*
+	contact_groups	fedora-sysadmin-email,fedora-sysadmin-emergency
+	first_notification	2
+	last_notification	0
+	notification_interval	60
+	escalation_period	24x7
+	escalation_options	[d,u,r]
+}
+
+
+define serviceescalation{
+	host_name	*
+	hostgroup_name	*
+	contact_groups	fedora-sysadmin-email,fedora-sysadmin-emergency
+	first_notification	2
+	last_notification	0
+	notification_interval	60
+	escalation_period	24x7
+	escalation_options	[w,u,c,r]
+}
diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios_server/files/nagios/hosts/templates.cfg
index 9226e20290..aaa6943bcb 100644
--- a/roles/nagios_server/files/nagios/hosts/templates.cfg
+++ b/roles/nagios_server/files/nagios/hosts/templates.cfg
@@ -10,7 +10,7 @@ define host {
   notification_interval         480
   notifications_enabled         1
   notification_options          d,r
-  contact_groups                fedora-sysadmin-email,fedora-sysadmin-emergency
+  contact_groups                fedora-sysadmin-ircbot
 
   register                      0
 }
@@ -26,7 +26,7 @@ define host {
     notification_interval         480
     notifications_enabled         1
     notification_options          d,r
-    contact_groups                fedora-sysadmin-email,fedora-sysadmin-emergency
+    contact_groups                fedora-sysadmin-ircbot
     register                      0
 }
 
@@ -85,6 +85,7 @@ define host {
   notification_interval         480
   notifications_enabled         1
   notification_options          d,r
+  contact_groups                fedora-sysadmin-ircbot
   register                      0
 }
 
diff --git a/roles/nagios_server/files/nagios/services/templates.cfg b/roles/nagios_server/files/nagios/services/templates.cfg
index c8de9fd139..2f7050d34a 100644
--- a/roles/nagios_server/files/nagios/services/templates.cfg
+++ b/roles/nagios_server/files/nagios/services/templates.cfg
@@ -7,7 +7,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email,fedora-sysadmin-emergency
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -22,7 +22,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -36,7 +36,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email,fedora-sysadmin-pager
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -50,7 +50,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -64,7 +64,7 @@ define service {
   notification_interval 500
   notification_period   16x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -78,7 +78,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email,fedora-sysadmin-emergency
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -92,7 +92,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        fedora-sysadmin-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -131,7 +131,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        ppc-secondary-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }
@@ -145,7 +145,7 @@ define service {
   notification_interval 360
   notification_period   24x7
   notification_options  w,u,c,r
-  contact_groups        retrace-email
+  contact_groups        fedora-sysadmin-ircbot
 
   register              0
 }