diff --git a/debian/postinst b/debian/postinst
index de714208b..de5febe92 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,6 +12,10 @@ do_configure() {
       bash /usr/share/yunohost/hooks/conf_regen/15-nginx True
   else
       yunohost service regenconf
+
+      # restart yunohost-firewall if it's running
+      service yunohost-firewall status > /dev/null \
+        && service yunohost-firewall restart
   fi
 }
 
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 000000000..01aee685b
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [ -x "/etc/init.d/yunohost-firewall" ]; then
+    invoke-rc.d yunohost-firewall stop || exit $?
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 601c47ea3..311b79678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@
 
 override_dh_installinit:
 	dh_installinit --name=yunohost-api
-	dh_installinit --name=yunohost-firewall
+	dh_installinit --name=yunohost-firewall --no-start