diff -u ferm-2.2/debian/changelog ferm-2.2/debian/changelog
--- ferm-2.2/debian/changelog
+++ ferm-2.2/debian/changelog
@@ -1,3 +1,10 @@
+ferm (2.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add native systemd unit, to break ordering cycle. (Closes: #796611)
+
+ -- Felipe Sateler <fsateler@debian.org>  Mon, 28 Mar 2016 20:36:07 -0300
+
 ferm (2.2-3) unstable; urgency=medium
 
   * [54e6ad3] Honor dpkg-statoverride for /etc&/ferm (Closes: #752686)
diff -u ferm-2.2/debian/control ferm-2.2/debian/control
--- ferm-2.2/debian/control
+++ ferm-2.2/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Alexander Wirt <formorer@debian.org>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), dh-systemd
 Build-Depends-Indep: po-debconf
 Vcs-Browser: https://github.com/formorer/pkg-ferm
 Vcs-Git: git://github.com/formorer/pkg-ferm.git
diff -u ferm-2.2/debian/rules ferm-2.2/debian/rules
--- ferm-2.2/debian/rules
+++ ferm-2.2/debian/rules
@@ -6,7 +6,7 @@
 #DH_VERBOSE = 1
 
 %:
-	dh $@
+	dh $@ --with systemd
 
 override_dh_auto_clean::
 
only in patch2:
unchanged:
--- ferm-2.2.orig/debian/ferm.service
+++ ferm-2.2/debian/ferm.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=ferm firewall configuration
+DefaultDependencies=no
+Wants=network-pre.target
+Before=network-pre.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/ferm start
+ExecReload=/etc/init.d/ferm reload
+ExecStop=/etc/init.d/ferm stop
+
+[Install]
+WantedBy=sysinit.target