diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 8e71a3bcac..6da867d13e 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -30,6 +30,7 @@
   with_items:
   - check_haproxy_conns.py
   - check_postfix_queue
+  - check_postfix_queue.py
   - check_raid.py
   - check_lock
   - check_fcomm_queue
@@ -125,6 +126,7 @@
   - check_disk.cfg
   - check_swap.cfg
   - check_postfix_queue.cfg
+  - check_postfix_redhat.cfg
   - check_lock.cfg
   - check_fedmsg_hub_proc.cfg
   - check_fedmsg_irc_proc.cfg
diff --git a/roles/nagios_client/templates/check_postfix_redhat.cfg.j2 b/roles/nagios_client/templates/check_postfix_redhat.cfg.j2
new file mode 100644
index 0000000000..5571bb423a
--- /dev/null
+++ b/roles/nagios_client/templates/check_postfix_redhat.cfg.j2
@@ -0,0 +1 @@
+command[check_postfix_redhat]={{ libdir }}/nagios/plugins/check_postfix_queue.py redhat.com -w 30 -c 50
diff --git a/roles/nagios_server/files/nagios/services/mail_queue.cfg b/roles/nagios_server/files/nagios/services/mail_queue.cfg
index 58e9c5750f..c08ce1176f 100644
--- a/roles/nagios_server/files/nagios/services/mail_queue.cfg
+++ b/roles/nagios_server/files/nagios/services/mail_queue.cfg
@@ -5,3 +5,11 @@ define service {
   max_check_attempts    7
   use                   defaulttemplate
 }
+
+define service {
+  host_name             bastion01.iad2.fedoraproject.org
+  service_description   mail_queue_redhat
+  check_command         check_by_nrpe!check_postfix_redhat
+  max_check_attempts    7
+  use                   defaulttemplate
+}