diff --git a/tools/build_deb.sh b/packaging/build_deb.sh
similarity index 71%
rename from tools/build_deb.sh
rename to packaging/build_deb.sh
index 4d8702c5..a3d0e3ef 100755
--- a/tools/build_deb.sh
+++ b/packaging/build_deb.sh
@@ -7,8 +7,8 @@ DEBIAN="$PWD/packaging/debian"
 RULES_D="$PWD/rules.d"
 
 BUILD_DIR="${TMPDIR:-/tmp}/$PWD"
-mkdir -m 0700 -p "$DIST"
-rm -rf "$DIST"/*
+mkdir -m 0700 -p "$BUILD_DIR"
+rm -rf "$BUILD_DIR"/*
 python setup.py sdist --dist-dir="$BUILD_DIR"
 
 cd "$BUILD_DIR"
@@ -20,18 +20,11 @@ mv "$S" solaar_$VERSION.orig.tar.gz
 
 cd solaar-*
 cp -a "$DEBIAN" .
-
 ls -1 "$RULES_D"/*.rules | while read rule; do
 	target=`basename "$rule"`
 	target=${target#??-}
 	target=${target%.rules}
 	cp -av "$rule" ./debian/solaar.$target.udev
 done
-
 debuild "$@"
-cd ..
-cp -au ./solaar_*.changes "$DIST"
-cp -au ./solaar_*.dsc "$DIST"
-cp -au ./solaar_*.debian.tar.gz "$DIST"
-cp -au ./solaar_*.orig.tar.gz "$DIST"
-cp -au ./solaar_*.deb "$DIST"
+cp -au ../solaar_* "$DIST"
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 13a9ddb0..26788fdc 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+solaar (0.8.5-3) UNRELEASED; urgency=low
+
+  * Fixed desktop file icon.
+  * Fixed X-Python-Version.
+
+ -- Daniel Pavel <daniel.pavel@gmail.com>  Sat, 05 Jan 2013 17:03:00 +0200
+
 solaar (0.8.5-2) UNRELEASED; urgency=low
 
   * Proper debian packaging, dropped stdeb.
diff --git a/packaging/debian/control b/packaging/debian/control
index 343e1d12..f2807369 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Daniel Pavel <daniel.pavel@gmail.com>
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: python
-X-Python-Version: >= 2.7, << 2.8
+X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.4
 Homepage: http://pwr.github.com/Solaar
diff --git a/tools/build_ppa.sh b/packaging/upload_ppa.sh
similarity index 64%
rename from tools/build_ppa.sh
rename to packaging/upload_ppa.sh
index c925fd59..273115ce 100755
--- a/tools/build_ppa.sh
+++ b/packaging/upload_ppa.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 cd `dirname "$0"`/..
-./tools/build_deb.sh -S -sa
+./packaging/build_deb.sh -S "$@"
 
 cd dist
 sed -e 's/UNRELEASED/precise/g' -i solaar_*_source.changes
 debsign --re-sign solaar_*_source.changes
-dput solaar-ppa solaar_*_source.changes
+dput -f solaar-ppa solaar_*_source.changes
+
diff --git a/share/applications/solaar.desktop b/share/applications/solaar.desktop
index 2069f1ae..da60a317 100644
--- a/share/applications/solaar.desktop
+++ b/share/applications/solaar.desktop
@@ -2,6 +2,7 @@
 Name=Solaar
 Comment=Logitech Unifying Receiver peripherals manager
 Exec=solaar
+Icon=solaar.png
 StartupNotify=false
 Terminal=false
 Type=Application