diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh
index 97e297362..d4cb5b69e 100755
--- a/pkg/deb/deb-buildsource.sh
+++ b/pkg/deb/deb-buildsource.sh
@@ -19,7 +19,7 @@ elif [ "$distributor" == "Ubuntu" ]; then
 fi
 codename=$(lsb_release --codename --short)
 date=$(date +%a," "%d" "%b" "%Y" "%T)
-pkg_name=keydb-$version$distname
+pkg_name=keydb-$majorv:$version$distname
 
 # create build tree
 cd ../../../
@@ -30,7 +30,7 @@ cp -r debian $pkg_name/tmp
 cp master_changelog $pkg_name/tmp/debian/changelog
 mv ../../../keydb_$version.orig.tar.gz ./$pkg_name
 cd $pkg_name/tmp
-changelog_str="keydb ($version-$build$distname) $codename; urgency=medium\n\n  * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com>  $date +0000\n\n"
+changelog_str="keydb ($majorv:$version-$build$distname) $codename; urgency=medium\n\n  * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com>  $date +0000\n\n"
 if [ $# -eq 0 ]; then
         sed -i "1s/^/$changelog_str\n/" debian/changelog
 elif [ $# -eq 1 ] && [ "$1" != "None" ]; then
@@ -44,7 +44,11 @@ debuild -S -sa
 cd ../
 
 # create pbuilder chrooted environment and build the deb package
-sudo pbuilder create --distribution $codename
+if [ "$codename" == "xenial" ]; then
+        sudo pbuilder create --distribution $codename --othermirror "deb http://archive.ubuntu.com/ubuntu $codename universe multiverse"
+else
+        sudo pbuilder create --distribution $codename
+fi
 sudo pbuilder --update
 sudo pbuilder --build *.dsc
 
diff --git a/pkg/deb/debian/bin/generate-systemd-service-files b/pkg/deb/debian/bin/generate-systemd-service-files
index 59031d99f..14e23d50a 100755
--- a/pkg/deb/debian/bin/generate-systemd-service-files
+++ b/pkg/deb/debian/bin/generate-systemd-service-files
@@ -78,8 +78,6 @@ do
 #
 #   $ systemctl start ${BINARY}@myname.service
 #   $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
-#
-#  -- Chris Lamb <lamby@debian.org>  Mon, 09 Oct 2017 22:17:24 +0100
 EOF
 		fi
 
diff --git a/pkg/deb/debian/keydb-sentinel.manpages b/pkg/deb/debian/keydb-sentinel.manpages
index 08ce51ff5..1b3d9d4a1 100644
--- a/pkg/deb/debian/keydb-sentinel.manpages
+++ b/pkg/deb/debian/keydb-sentinel.manpages
@@ -1 +1 @@
-debian/keydb-pro-sentinel.1
+debian/keydb-sentinel.1
diff --git a/pkg/deb/debian/keydb-server.manpages b/pkg/deb/debian/keydb-server.manpages
index 06ff67ee3..3935e22fd 100644
--- a/pkg/deb/debian/keydb-server.manpages
+++ b/pkg/deb/debian/keydb-server.manpages
@@ -1 +1 @@
-debian/keydb-pro-server.1
+debian/keydb-server.1
diff --git a/pkg/deb/debian/rules b/pkg/deb/debian/rules
index bc14ea0f6..a039b220f 100755
--- a/pkg/deb/debian/rules
+++ b/pkg/deb/debian/rules
@@ -18,13 +18,14 @@ endif
 
 override_dh_auto_install:
 	debian/bin/generate-systemd-service-files
+	dh_installsystemd --restart-after-upgrade
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Avoid race conditions in upstream testsuite.
-#	./runtest --clients 1 || true
-#	./runtest-cluster || true
-#	./runtest-sentinel || true
+	./runtest || true
+	./runtest-cluster || true
+	./runtest-sentinel || true
 endif
 
 override_dh_auto_clean: