diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index d71f837834..b89cd41c3d 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -34,7 +34,6 @@ all: package
 package: clean
 	cp -a $(SOURCE_DIST_FILE) $(DEBIAN_ORIG_TARBALL)
 	xzcat $(DEBIAN_ORIG_TARBALL) | tar -xf -
-	cp -a debian $(UNPACKED_DIR)
 	rsync -a \
 		--exclude '.sw?' --exclude '.*.sw?' \
 		--exclude '.git*' \
diff --git a/packaging/debs/Debian/debian/postrm.in b/packaging/debs/Debian/debian/postrm
similarity index 99%
rename from packaging/debs/Debian/debian/postrm.in
rename to packaging/debs/Debian/debian/postrm
index c2e9bbfedc..16c5c42952 100644
--- a/packaging/debs/Debian/debian/postrm.in
+++ b/packaging/debs/Debian/debian/postrm
@@ -61,5 +61,3 @@ esac
 #DEBHELPER#
 
 exit 0
-
-
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 48510ec8a6..4f4c9ef260 100755
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -5,7 +5,6 @@
 #export DH_VERBOSE=1
 
 DEB_DESTDIR = debian/rabbitmq-server
-VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {version=$$0; sub(/Version: /, "", version); sub(/-.*/, "", version); print version;}')
 
 unexport DEPS_DIR
 
@@ -26,14 +25,11 @@ export PREFIX RMQ_ROOTDIR
 
 override_dh_auto_install: PREFIX = /usr
 override_dh_auto_install: RMQ_ROOTDIR = $(PREFIX)/lib/rabbitmq
-override_dh_auto_install: RMQ_ERLAPP_DIR = $(RMQ_ROOTDIR)/lib/rabbitmq_server-$(VERSION)
+override_dh_auto_install: RMQ_ERLAPP_DIR = $(RMQ_ROOTDIR)/lib/rabbitmq_server-*
 override_dh_auto_install:
-	dh_auto_install -- VERSION=$(VERSION)
+	dh_auto_install
 
-	$(MAKE) install-bin DESTDIR=$(DEB_DESTDIR) VERSION=$(VERSION)
-
-	sed -e 's|@RABBIT_LIB@|$(RMQ_ERLAPP_DIR)|g' \
-		< debian/postrm.in > debian/postrm
+	$(MAKE) install-bin DESTDIR=$(DEB_DESTDIR)
 
 	sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
 		-e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \