diff --git a/Makefile b/Makefile
deleted file mode 100644
index 70b94ca6..00000000
--- a/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# quick dirty hacks
-#
-DESTDIR=debian/fail2ban
-MANPAGE=fail2ban.8
-all:: $(MANPAGE)
-
-
-$(MANPAGE): fail2ban fail2ban.h2m
-	help2man --include fail2ban.h2m --section=1x --no-info --output $@ ./fail2ban
-
-install:: all
-	python setup.py install --root=debian/fail2ban/
-	mkdir -p $(DESTDIR)/etc
-	cp config/fail2ban.conf.default $(DESTDIR)/etc/fail2ban.conf
-
-clean::
-	rm -rf changelog.gz $(MANPAGE) build* `find -iname '*.pyc' `
diff --git a/debian/logrotate b/config/fail2ban.logrotate
similarity index 100%
rename from debian/logrotate
rename to config/fail2ban.logrotate
diff --git a/debian/changelog b/debian/changelog
index 828aece0..ee3a12d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fail2ban (0.6.0-8) unstable; urgency=low
+
+  * Minor adjustments to reduce the deviation from the upstream code
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Sat, 11 Mar 2006 00:48:14 -0500
+
 fail2ban (0.6.0-7) unstable; urgency=low
 
   * Fixed a typo in failregex for SSH section (closes: #356112)
diff --git a/debian/rules b/debian/rules
index b6f87479..89889cbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,42 +9,28 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+MANPAGE=fail2ban.8
+DESTDIR=$(CURDIR)/debian/fail2ban
 
 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
 
 copy-inits:
 	cp config/gentoo-confd debian/fail2ban.default 
 	cp config/debian-initd debian/fail2ban.init
+	cp config/fail2ban.logrotate debian/
 
 clean-inits:
-	rm -f debian/fail2ban.default debian/fail2ban.init
+	rm -f debian/fail2ban.{default,init,logrotate}
 
 clean:	clean-inits
 	dh_testdir
@@ -52,7 +38,7 @@ clean:	clean-inits
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	rm -rf changelog.gz $(MANPAGE) build* `find -iname '*.pyc' `
 
 	dh_clean 
 
@@ -63,12 +49,17 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/fail2ban.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/fail2ban
-
+	python setup.py install --root=$(DESTDIR)
+	mkdir -p $(DESTDIR)/etc
+	cp config/fail2ban.conf.default $(DESTDIR)/etc/fail2ban.conf
 
+# To build manpage
+$(MANPAGE): fail2ban fail2ban.h2m
+	help2man --include fail2ban.h2m --section=1x --no-info --output $@ ./fail2ban
+ 
 # Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep: build install $(MANPAGE)
+	
 	# migrated from binary-arch
 	dh_python
 
diff --git a/firewall/firewall.py b/firewall/firewall.py
index 6574b350..52414fa0 100644
--- a/firewall/firewall.py
+++ b/firewall/firewall.py
@@ -32,10 +32,6 @@ from utils.process import executeCmd
 # we might endup with not "full" flush unless we handle exception within the loop
 from utils.process import ExternalError
 from utils.strings import replaceTag
-# unfortunately but I have to bring ExternalError in especially for
-# flushBanList: if one of IPs got flushed manually outside or something, we
-# might endup with not "full" flush unless we handle exception within the loop
-from utils.process import ExternalError
 
 # Gets the instance of the logger.
 logSys = logging.getLogger("fail2ban")