diff --git a/Makefile.in b/Makefile.in
index e89d242..5814473 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -149,7 +149,7 @@ $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib
 
 #---[ File lists ]-------------------------------------------------------------
 
-filelist: debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install
+filelist: debian/lib3270-dev.install debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install
 
 debian/lib3270-dev.install: Makefile
 	@echo "  GEN  `basename $@`"
@@ -263,12 +263,12 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
 install: install-sdk install-lib install-app install-man
 
 install-app: install-locale
-	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
+	@$(MAKE) DESTDIR=$(DESTDIR) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 	@$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 
 install-lib:
-	@$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install
+	@$(MAKE) DESTDIR=$(DESTDIR) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install
 
 locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
 
@@ -307,6 +307,7 @@ clean:
 	@rm -f $(PACKAGE_NAME).png
 	@rm -f $(PACKAGE_NAME)-logo.png
 	@rm -f *.log
+	@rm -fr debian
 	@echo "$@"
 
 cleanDebug: clean
@@ -314,7 +315,6 @@ cleanDebug: clean
 
 distclean: clean
 	@make -C src/pw3270 distclean
-	@rm -f debian/*.install
 	@rm -f src/pw3270/Makefile
 	@rm -f config.status
 	@rm -f src/lib3270/mkversion.sh
@@ -322,7 +322,6 @@ distclean: clean
 	@rm -f src/include/lib3270/config.h
 	@rm -f src/pw3270/uiparser/Makefile
 	@rm -fr autom4te.cache
-	@rm -fr debian
 	@rm -f *.pc
 	@rm -f $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar*
 	@find ./src -name "Makefile" -exec rm -f {} \;
diff --git a/makedeb.sh b/makedeb.sh
index 1fba64a..7704920 100755
--- a/makedeb.sh
+++ b/makedeb.sh
@@ -10,7 +10,7 @@ mkdir debian
 
 echo 7 > debian/compat
 cp debian.control debian/control
-cp debian.rules debian/control
+cp debian.rules debian/rules
 
 EDITOR=true dch --preserve -v $VERSION-$PACKAGE_LEVEL -u low --create --package pw3270
 sed -i "s@UNRELEASED@unstable@;s@Initial release. (Closes: #XXXXXX)@SVN Revision $PACKAGE_REVISION@" debian/changelog
--
libgit2 0.21.2