diff --git a/roles/nagios/client/tasks/main.yml b/roles/nagios/client/tasks/main.yml
index 60d38ff583..93ee9157b2 100644
--- a/roles/nagios/client/tasks/main.yml
+++ b/roles/nagios/client/tasks/main.yml
@@ -136,6 +136,18 @@
   - config
   - nagios/client
 
+#
+# The actual items files here end in .j2 (they are templates)
+# So when adding or modifying them change the .j2 version in git.
+#
+- name: install nrpe bugyou fedmsg hubs check config
+  template: src=check_fedmsg_hub_procs_bugyou.j2 dest=/etc/nrpe.d/check_fedmsg_hub_procs_bugyou.cfg
+  when: inventory_hostname.startswith('bugyou01')
+  notify:
+  - restart nrpe
+  tags:
+  - nagios/client
+
 #
 # The actual items files here end in .j2 (they are templates)
 # So when adding or modifying them change the .j2 version in git.
diff --git a/roles/nagios/client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2
new file mode 100644
index 0000000000..94678ebb3d
--- /dev/null
+++ b/roles/nagios/client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2
@@ -0,0 +1 @@
+command[check_fedmsg_hub_procs_bugyou]={{ libdir }}/nagios/plugins/check_procs -c 3:3 -C 'fedmsg-hub' -u fedmsg
diff --git a/roles/nagios/server/files/nagios/services/fedmsg.cfg b/roles/nagios/server/files/nagios/services/fedmsg.cfg
index d41b793dab..81740e0a9c 100644
--- a/roles/nagios/server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios/server/files/nagios/services/fedmsg.cfg
@@ -108,7 +108,7 @@ define service {
 define service {
   host_name             bugyou01
   service_description   Check for fedmsg-hub proc
-  check_command         check_by_nrpe!check_fedmsg_hub_proc
+  check_command         check_by_nrpe!check_fedmsg_hub_procs_bugyou
   use                   defaulttemplate
 }
 define service {