diff --git a/debian/changelog b/debian/changelog
index ea7ec1b4..f821f13d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-fail2ban (0.8.0-2~pre1) unstable; urgency=low
+fail2ban (0.8.0-2~pre2) unstable; urgency=low
 
   * Manually changing the order of debhelper inserted scripts in prerm
     (Closes: #422655)
   * Removed obsolete hack to have /bin/env invocation of python for
     fail2ban-* scripts
-
- -- Yaroslav Halchenko <debian@onerussian.com>  Thu, 10 May 2007 11:32:32 -0400
+  * Applied changes submitted by Bernd Zeimetz (thanks Bernd):
+    - Removed obsolete Build-Depends-Indep on help2man, python-dev
+  	- Explicit removal of *.pyc files compiled during build
+  	- Invoke 'python setup.py clean' in clean target, which required also
+  	  to move python into Build-Depends
+  * Minor clean up of debian/rules
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Tue, 15 May 2007 10:22:11 -0400
 
 fail2ban (0.8.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 85a03754..b26dae0a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: fail2ban
 Section: net
 Priority: optional
 Maintainer: Yaroslav Halchenko <debian@onerussian.com>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch
-Build-Depends-Indep: python, python-dev, help2man, python-central (>= 0.5.6)
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, python
+Build-Depends-Indep: python-central (>= 0.5.6)
 XS-Python-Version: current, >= 2.4
 Standards-Version: 3.7.2
 
@@ -21,7 +21,7 @@ Description: bans IPs that cause multiple authentication errors
  IP using iptables or hostsdeny rules, or simply to send a
  notification email. Currently, by default, supports ssh/apache/vsftpd
  but configuration can be easily extended for monitoring any other ASCII
- file. All filters and actions are given in the config files, thus 
+ file. All filters and actions are given in the config files, thus
  fail2ban can be adopted to be used with a variety of files and
  firewalls.
  .
diff --git a/debian/rules b/debian/rules
index b904a2f3..cc4dbfb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ include /usr/share/dpatch/dpatch.make
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 	touch configure-stamp
 
 build: patch
@@ -27,29 +26,32 @@ build: patch
 clean: clean-inits unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f  build-stamp configure-stamp
+	rm -rf build
+	# Does not hurt to ask distutils to do their duty
+	python setup.py clean
+	# Enforce removal of *.pyc files. Apparently dh_clean does
+	# not perform find on provided filename patterns.
+	find . -name \*.pyc -exec rm -f {} \;
+	dh_clean
 
-	rm -rf build 
-	dh_clean *.pyc
-
-install: build 
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/fail2ban.
+	# Install the package into debian/fail2ban.
 	python setup.py install --root=$(DESTDIR) --no-compile
-	#  Install Debian shipped jail file in 1 piece (instead of patching
-	#  the shipped one since there are too many changes)
+	# Install Debian shipped jail file in 1 piece (instead of patching
+	# the shipped one since there are too many changes)
 	install -m 644 debian/jail.conf $(DESTDIR)/etc/fail2ban
 
-# 
+#
 # Just to comply with policy 4.8
 binary-arch:
 
 # Build architecture-independent files here.
-#X binary-indep: install
 binary-indep: install
 	dh_testdir
 	dh_testroot
@@ -60,8 +62,10 @@ binary-indep: install
 	dh_pycentral
 	dh_installinit -- defaults 99
 	# perform swap of order of calls to init and pycentral in prerm
-	# to close #422655 -- pycentral section is cut and placed at the end of the file
-	sed -i -e '/^#.*ed by dh_pycentral/,/# End auto/{H;d};$$G' debian/fail2ban.prerm.debhelper
+	# to close #422655 -- pycentral section is cut and placed at
+	# the end of the file
+	sed -i -e '/^#.*ed by dh_pycentral/,/# End auto/{H;d};$$G' \
+		debian/fail2ban.prerm.debhelper
 	dh_installman man/*.1
 	dh_link
 	dh_compress