diff --git a/Makefile b/Makefile
index 8af510bc..40ff464e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ install:: all
 	mkdir -p $(DESTDIR)/etc/default
 	python setup.py install --root=debian/fail2ban/
 	cp config/fail2ban.conf.default $(DESTDIR)/etc/fail2ban.conf
-	cp config/gentoo-confd   $(DESTDIR)/etc/default/fail2ban
 
 clean::
 	rm -rf changelog.gz fail2ban.1x build* `find -iname '*.pyc' `
diff --git a/config/debian-initd b/config/debian-initd
index d3266f33..2d9e1628 100644
--- a/config/debian-initd
+++ b/config/debian-initd
@@ -8,7 +8,7 @@
 #               Adjusted for Fail2Ban
 #                by Yaroslav Halchenko <debian@onerussian.com>.
 #                
-# Version:	$Id: $
+# Version:	$Id$
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/debian/fail2ban.init b/debian/fail2ban.init
deleted file mode 100644
index fb4c937a..00000000
--- a/debian/fail2ban.init
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian 
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/fail2ban
-NAME=fail2ban
-DESC=fail2ban
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-# Include fail2ban defaults if available
-if [ -f /etc/default/fail2ban ] ; then
-	. /etc/default/fail2ban
-fi
-DAEMON_OPTS=$FAIL2BAN_OPTS
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-        [ -f $PIDFILE ] && [ ! -d /proc/`cat $PIDFILE` ] && rm -f $PIDFILE
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-	        -b --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid 
-        rm -f $PIDFILE
-	echo "$NAME."
-	;;
-  restart|force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart".
-	#
-	echo -n "Restarting $DESC: "
-        ( $0 stop )
-	sleep 1
-        $0 start
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/rules b/debian/rules
index d030e486..671f8025 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,14 @@ build-stamp: configure-stamp
 
 	touch build-stamp
 
-clean:
+copy-inits:
+	cp config/gentoo-confd debian/fail2ban.default 
+	cp config/debian-initd debian/fail2ban.init
+
+clean-inits:
+	rm -f debian/fail2ban.default debian/fail2ban.init
+	
+clean:	clean-inits
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -64,7 +71,7 @@ binary-indep: build install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install copy-inits
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGELOG
@@ -95,4 +102,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure copy-inits clean-inits