diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index eb623c7075..d92a71ee48 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -137,3 +137,15 @@
   tags:
   - service
   - nagios_client
+
+- name: Check if the fedmsg group exists
+  shell: /usr/bin/getent group fedmsg | /usr/bin/wc -l | tr -d ' '
+  register: fedmsg_exists
+  tags:
+  - nagios_client
+
+- name: Add nrpe user to the fedmsg group if it exists
+  user: name=nrpe groups=fedmsg append=yes
+  when: fedmsg_exists.stdout == "1"
+  tags:
+  - nagios_client