diff --git a/config/debian-initd b/config/debian-initd
index 2c5c48d1..be788d4c 100644
--- a/config/debian-initd
+++ b/config/debian-initd
@@ -10,8 +10,7 @@
 #
 # Version:	$Id$
 #
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+export PATH="${PATH:+$PATH:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 DAEMON=/usr/bin/fail2ban
 NAME=fail2ban
 DESC=fail2ban
@@ -31,7 +30,7 @@ case "$1" in
 		echo -n "Starting $DESC: "
 		[ -f $PIDFILE ] && [ ! -d /proc/`cat $PIDFILE` ] && rm -f $PIDFILE
 		start-stop-daemon --start --quiet --pidfile $PIDFILE \
-			-b --exec $DAEMON -- $DAEMON_OPTS
+			--exec $DAEMON -- $DAEMON_OPTS
 		echo "$NAME."
 		;;
 	stop)
diff --git a/debian/changelog b/debian/changelog
index f581342e..445a5515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fail2ban (0.5.4-2) unstable; urgency=low
+
+  * Now exporting PATH explicitely in init.d/fail2ban script, to avoid
+    problems finding iptables in the cases when PATH was not exported outside
+    (cfengine, broken shell environment) (closes: #329304)
+  * Removed -b from start-stop-daemon because fail2ban detahes on its own
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Wed, 21 Sep 2005 08:09:06 -0400
+
 fail2ban (0.5.4-1) unstable; urgency=low
 
   * New upstream release