diff --git a/redis/handlers/main.yml b/redis/handlers/main.yml
index 8a416b0e..49b906a1 100644
--- a/redis/handlers/main.yml
+++ b/redis/handlers/main.yml
@@ -8,3 +8,8 @@
   service:
     name: munin-node
     state: restarted
+
+- name: restart nagios-nrpe-server
+  service:
+    name: nagios-nrpe-server
+    state: restarted
diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml
index eb31749e..3c76eab5 100644
--- a/redis/tasks/main.yml
+++ b/redis/tasks/main.yml
@@ -34,3 +34,12 @@
 
 - include: munin.yml
   when: _munin_installed.stat.exists and _munin_installed.stat.isdir
+
+- name: is NRPE present ?
+  stat:
+    path: /etc/nagios/nrpe.d/evolix.cfg
+  check_mode: no
+  register: nrpe_evolix_config
+
+- include: nrpe_stretch.yml
+  when: ansible_distribution_release == "stretch" and nrpe_evolix_config == true
diff --git a/redis/tasks/nrpe_stretch.yml b/redis/tasks/nrpe_stretch.yml
new file mode 100644
index 00000000..a2ffba17
--- /dev/null
+++ b/redis/tasks/nrpe_stretch.yml
@@ -0,0 +1,15 @@
+---
+- name: Install perl lib-redis (needed by check_redis)
+  apt:
+    name: libredis-perl
+    state: present
+  tags:
+    - redis
+    - nrpe
+
+- name: Replace check_tcp by check_redis for NRPE
+  replace:
+    dest: /etc/nagios/nrpe.d/evolix.cfg
+    regexp: '^command\[check_redis\]=\/usr\/lib\/nagios\/plugins\/check_tcp -p 6379'
+    replace: 'command[check_redis]=/usr/lib/nagios/plugins/check_redis -H 127.0.0.1'
+  notify: restart nagios-nrpe-server