diff --git a/hosts.yml b/hosts.yml
index 0f8a837..0d5de83 100644
--- a/hosts.yml
+++ b/hosts.yml
@@ -223,8 +223,6 @@ all:
 
       nut_host: localhost
 
-      nut_listen: "10.0.0.0/24"
-
     caladan:
       ansible_host: caladan
       ansible_user: ansible
diff --git a/roles/nut/tasks/upsd.yml b/roles/nut/tasks/upsd.yml
index 654bea7..6e80831 100644
--- a/roles/nut/tasks/upsd.yml
+++ b/roles/nut/tasks/upsd.yml
@@ -27,11 +27,13 @@
         password = "{{ nut_upsmon_password }}"
         upsmon {{ nut_types[nut_mode] }}
 
-- name: add LISTEN line to /etc/nut/upsd.conf
-  lineinfile:
+- name: allow NUT to listen to all IPs
+  blockinfile:
     path: /etc/nut/upsd.conf
-    regexp: '^LISTEN'
-    line: "LISTEN {{ nut_listen }}"
+    block: |
+      LISTEN 0.0.0.0
+      LISTEN ::1
+  when: nut_mode == "netserver"
 
 - name: start and enable nut-upsd
   service: