diff --git a/packages/maemo-applet/debian/changelog b/packages/maemo-applet/debian/changelog
index 02a5a6c97..4339e8b2c 100644
--- a/packages/maemo-applet/debian/changelog
+++ b/packages/maemo-applet/debian/changelog
@@ -1,3 +1,9 @@
+strongswan-applet (1.0.1-2) unstable; urgency=low
+
+  * Exclude static libraries from package
+
+ -- Tobias Brunner <tobias@strongswan.org>  Tue, 08 Feb 2011 16:15:07 +0100
+
 strongswan-applet (1.0.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/packages/maemo-applet/debian/rules b/packages/maemo-applet/debian/rules
index 3dc5d47ac..d05be0506 100755
--- a/packages/maemo-applet/debian/rules
+++ b/packages/maemo-applet/debian/rules
@@ -45,14 +45,11 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
-
-	# Add here commands to compile the arch part of the package.
-	#$(MAKE)
+	$(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp:  config.status
-
 	# Add here commands to compile the indep part of the package.
 	#$(MAKE) doc
 	touch $@
@@ -62,7 +59,6 @@ clean:
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -71,33 +67,18 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-
 	dh_clean
 
-install: install-indep install-arch
-install-indep:
+install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
+	dh_clean -k
+	dh_installdirs
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
-	dh_install -i
+	dh_install --list-missing --sourcedir=debian/tmp
 
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into
-	# debian/tmp.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/strongswan-applet install
-
-	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -130,12 +111,12 @@ binary-common:
 	dh_md5sums
 	dh_builddeb
 # Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+binary-indep: build-indep install
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
+binary-arch: build-arch install
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/packages/maemo-applet/debian/strongswan-applet.install b/packages/maemo-applet/debian/strongswan-applet.install
new file mode 100644
index 000000000..8c50afce0
--- /dev/null
+++ b/packages/maemo-applet/debian/strongswan-applet.install
@@ -0,0 +1,7 @@
+# libraries
+usr/lib/hildon-control-panel/libstrongswan-settings.so*
+usr/lib/hildon-desktop/libstrongswan-status.so*
+# *.desktop files
+usr/share/applications
+# icons
+usr/share/icons/hicolor