diff --git a/debian/changelog b/debian/changelog
index c23369c..7927218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ nut (2.6.1-2) UNRELEASED; urgency=low
     - Set nut-powerman-pdu priority to extras
     - Add nut-monitor package
     - Add nut-doc package and add required C/R/P
+  * debian/nut-server.prerm: Remove /var/run/nut during removal
 
- -- Laurent Bigonville <bigon@debian.org>  Fri, 15 Jul 2011 14:59:36 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Fri, 15 Jul 2011 15:31:30 +0200
 
 nut (2.6.1-1) unstable; urgency=low
 
diff --git a/debian/nut-server.prerm b/debian/nut-server.prerm
index 2c9c2e1..6292ef8 100644
--- a/debian/nut-server.prerm
+++ b/debian/nut-server.prerm
@@ -14,7 +14,7 @@ case "$1" in
     [ -L /usr/doc/nut ] && rm -f /usr/doc/nut
     # do stop the daemon on remove
     invoke-rc.d nut stop && sleep 1
-    [ -d /var/run/nut ] && rm -f /var/run/nut/*.pid
+    [ -d /var/run/nut ] && rm -rf /var/run/nut/
     ;;
 
   upgrade)