diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 63c70af1..5588304f 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -18,4 +18,4 @@ override_dh_auto_install:
 override_dh_auto_build:
 
 override_dh_installudev:
-	dh_installudev -v --priority=99 --name=logitech-unifying-receiver
+	dh_installudev --priority=99 --name=logitech-unifying-receiver
diff --git a/setup.py b/setup.py
index 93d067e5..73870fbe 100755
--- a/setup.py
+++ b/setup.py
@@ -5,43 +5,41 @@ from distutils.core import setup
 
 
 setup(name='solaar',
-      version='0.8.5',
-      description='Linux devices manager for the Logitech Unifying Receiver.',
-      long_description='''
+		version='0.8.5',
+		description='Linux devices manager for the Logitech Unifying Receiver.',
+		long_description='''
 Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals.
 It is able to pair/unpair devices to the receiver, and for some devices read
 battery status.
 '''.strip(),
-      author='Daniel Pavel',
-      author_email='daniel.pavel@gmail.com',
-      license='GPLv2',
-      url='http://pwr.github.com/Solaar/',
-      classifiers=[
+		author='Daniel Pavel',
+		author_email='daniel.pavel@gmail.com',
+		license='GPLv2',
+		url='http://pwr.github.com/Solaar/',
+		classifiers=[
 			'Development Status :: 4 - Beta',
 			'Environment :: X11 Applications :: GTK',
 			'Environment :: Console',
-      		'Intended Audience :: End Users/Desktop',
+			'Intended Audience :: End Users/Desktop',
 			'License :: DFSG approved',
 			'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-                  'Natural Language :: English',
-      		'Programming Language :: Python :: 2.7',
-                  'Programming Language :: Python :: 3.2',
-      		'Operating System :: POSIX :: Linux',
-      		'Topic :: Utilities',
-      	],
+			'Natural Language :: English',
+			'Programming Language :: Python :: 2.7',
+			'Programming Language :: Python :: 3.2',
+			'Operating System :: POSIX :: Linux',
+			'Topic :: Utilities',
+			],
 
-      platforms=['linux'],
-      requires=['pyudev (>= 0.13)', 'gi.repository.GObject (>= 2.0)', 'gi.repository.Gtk (>= 3.0)'],
+		platforms=['linux'],
+		requires=['pyudev (>= 0.13)', 'gi.repository.GObject (>= 2.0)', 'gi.repository.Gtk (>= 3.0)'],
 
-      package_dir={'': 'lib'},
-      packages=['hidapi', 'logitech', 'logitech.unifying_receiver', 'solaar', 'solaar.ui'],
+		package_dir={'': 'lib'},
+		packages=['hidapi', 'logitech', 'logitech.unifying_receiver', 'solaar', 'solaar.ui'],
 
-      data_files=[
-                  ('share/icons/hicolor/128x128/apps', ['share/solaar/icons/solaar.png']),
-                  ('share/solaar/icons', glob('share/solaar/icons/*.png')),
-                  ('share/applications', ['share/applications/solaar.desktop']),
-                  ('share/doc/solaar', glob('share/doc/*')),
-      	],
+		data_files=[('share/icons', ['share/solaar/icons/solaar.png']),
+					('share/applications', ['share/applications/solaar.desktop']),
+					('share/solaar/icons', glob('share/solaar/icons/*.png')),
+					],
 
-      scripts=glob('bin/*'),
-     )
+		scripts=glob('bin/*'),
+	)
diff --git a/share/applications/solaar.desktop b/share/applications/solaar.desktop
index da60a317..2069f1ae 100644
--- a/share/applications/solaar.desktop
+++ b/share/applications/solaar.desktop
@@ -2,7 +2,6 @@
 Name=Solaar
 Comment=Logitech Unifying Receiver peripherals manager
 Exec=solaar
-Icon=solaar.png
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/tools/build_deb.sh b/tools/build_deb.sh
index b6cd26ac..4d8702c5 100755
--- a/tools/build_deb.sh
+++ b/tools/build_deb.sh
@@ -1,15 +1,17 @@
 #!/bin/sh
 
 cd `dirname "$0"`/..
+mkdir -p dist
+DIST="$PWD/dist"
 DEBIAN="$PWD/packaging/debian"
 RULES_D="$PWD/rules.d"
 
-DIST="${TMPDIR:-/tmp}/$PWD"
+BUILD_DIR="${TMPDIR:-/tmp}/$PWD"
 mkdir -m 0700 -p "$DIST"
 rm -rf "$DIST"/*
-python setup.py sdist --dist-dir="$DIST"
+python setup.py sdist --dist-dir="$BUILD_DIR"
 
-cd "$DIST"
+cd "$BUILD_DIR"
 S=`ls -1 solaar-*.tar.gz`
 VERSION=${S#solaar-}
 VERSION=${VERSION%.tar.gz}
@@ -19,11 +21,17 @@ mv "$S" solaar_$VERSION.orig.tar.gz
 cd solaar-*
 cp -a "$DEBIAN" .
 
-for rule in "$RULES_D"/*.rules; do
+ls -1 "$RULES_D"/*.rules | while read rule; do
 	target=`basename "$rule"`
-	target=${target##??-}
-	target=${target%%.rules}
+	target=${target#??-}
+	target=${target%.rules}
 	cp -av "$rule" ./debian/solaar.$target.udev
 done
 
-debuild -uc -us
+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"
diff --git a/tools/build_ppa.sh b/tools/build_ppa.sh
new file mode 100755
index 00000000..c925fd59
--- /dev/null
+++ b/tools/build_ppa.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+cd `dirname "$0"`/..
+./tools/build_deb.sh -S -sa
+
+cd dist
+sed -e 's/UNRELEASED/precise/g' -i solaar_*_source.changes
+debsign --re-sign solaar_*_source.changes
+dput solaar-ppa solaar_*_source.changes