diff --git a/packaging/build_deb.sh b/packaging/build_deb.sh
index 9129c95a..d9fc6754 100755
--- a/packaging/build_deb.sh
+++ b/packaging/build_deb.sh
@@ -22,7 +22,6 @@ cd solaar-$VERSION
 cp -a "$DEBIAN_FILES" .
 
 test -n "$DEBIAN_FILES_EXTRA" && cp -a $DEBIAN_FILES_EXTRA/* debian/
-# test -d debian/patches && ls -1 debian/patches/*.diff | cut -d / -f 3 > debian/patches/series
 
 debuild ${DEBUILD_ARGS:-$@}
 
diff --git a/packaging/build_ppa.sh b/packaging/build_ppa.sh
index 0349d75f..4efb72da 100755
--- a/packaging/build_ppa.sh
+++ b/packaging/build_ppa.sh
@@ -4,10 +4,13 @@ set -e
 
 cd `dirname "$0"`/..
 
+DISTRIBUTION=ubuntu
+DEBIAN_FILES_EXTRA="$PWD/packaging/ubuntu"
+
 . "$HOME/.devscripts"
 
-DEBIAN_CHANGELOG=$PWD/packaging/debian/changelog
-PPA_CHANGELOG=$PWD/packaging/ubuntu/changelog
+DEBIAN_CHANGELOG="$PWD/packaging/debian/changelog"
+PPA_CHANGELOG="$DEBIAN_FILES_EXTRA/changelog"
 
 latest=`head -n 1 "$DEBIAN_CHANGELOG" | sed -e 's#(\([^)]*\))#(\1ppa1)#; s#UNRELEASED#precise#'`
 cat - "$DEBIAN_CHANGELOG" > "$PPA_CHANGELOG" <<_CHANGELOG
@@ -19,8 +22,6 @@ $latest
 
 _CHANGELOG
 
-DISTRIBUTION=ubuntu
-DEBIAN_FILES_EXTRA=$PWD/packaging/ubuntu
 DEBUILD_ARGS="-S"
 . packaging/build_deb.sh
 
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 1e95a88e..1de0817f 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -15,6 +15,9 @@ PREFIX = /usr
 override_dh_auto_install:
 	dh_auto_install -- --prefix=$(PREFIX) --install-lib=$(PREFIX)/share/solaar/lib
 
+override_dh_python2:
+	dh_python2 $(PREFIX)/share/solaar
+
 override_dh_installudev:
 	cp rules.d/??-logitech-unifying-receiver.rules debian/solaar.logitech-unifying-receiver.udev
 	dh_installudev --priority=99 --name=logitech-unifying-receiver
diff --git a/packaging/ubuntu/rules.extra b/packaging/ubuntu/rules.extra
index c0139a09..493b5756 100644
--- a/packaging/ubuntu/rules.extra
+++ b/packaging/ubuntu/rules.extra
@@ -5,5 +5,7 @@ PREFIX = /opt/extras.ubuntu.com/solaar
 # hacky...
 override_dh_link:
 	dh_link
+	sed -i -e 's#Exec=solaar#Exec=/opt/extras.ubuntu.com/solaar/bin/solaar#' \
+		debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop
 	sed -i -e 's#Icon=solaar.png#Icon=/opt/extras.ubuntu.com/solaar/share/icons/solaar.png#' \
 		debian/solaar/opt/extras.ubuntu.com/solaar/share/applications/solaar.desktop