diff --git a/Makefile b/Makefile
index 5c2dbde8..20e1b495 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,15 @@ DESTDIR=debian/fail2ban
 
 all:: 
 	cp fail2ban.py fail2ban
-	gzip -c CHANGELOG > changelog.gz
+	help2man -N -s 1 fail2ban >| fail2ban.1
 
 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
 	mkdir -p $(DESTDIR)/usr/lib/fail2ban/
 	cp log4py.py $(DESTDIR)/usr/lib/fail2ban/
 
 clean::
-	rm -rf changelog.gz fail2ban `find -iname '*.pyc' `
+	rm -rf changelog.gz fail2ban{,.1} build* `find -iname '*.pyc' `
diff --git a/debian/fail2ban.conffiles b/debian/fail2ban.conffiles
deleted file mode 100644
index 24163f38..00000000
--- a/debian/fail2ban.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/fail2ban.conf
-/etc/default/fail2ban
diff --git a/debian/rules b/debian/rules
index 39451be1..6e142bda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,98 @@
 #!/usr/bin/make -f
-# Copyrignt 2003-04 Yaroslav Halchenko <debian@onerussian.com>
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/buildcore.mk
-#include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-#DEB_MAKE_INSTALL_TARGET := "install DESTDIR=debian/fail2ban"
-# does on package by package bases so doesn't work :-/
-#DEB_DH_INSTALL_ARGS := --list-missing
-# DEB_OPT_FLAG := 
-# DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug
-# tight versioning
-#DEB_DH_MAKESHLIBS_ARGS := -V
-common-install-prehook-impl::
-	make install
-clean::
-	make clean
+
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/fail2ban.sgml > fail2ban.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/fail2ban.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/fail2ban
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGELOG
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman fail2ban.1
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure