diff --git a/packages/maemo-strongswan/debian/rules b/packages/maemo-strongswan/debian/rules
index c2fa9dc72..20eabe56d 100755
--- a/packages/maemo-strongswan/debian/rules
+++ b/packages/maemo-strongswan/debian/rules
@@ -62,14 +62,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 $@
@@ -79,7 +76,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
@@ -88,33 +84,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 install
-
-	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -146,13 +127,14 @@ binary-common:
 	dh_gencontrol
 	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-strongswan/debian/strongswan.install b/packages/maemo-strongswan/debian/strongswan.install
new file mode 100644
index 000000000..ef2ac5709
--- /dev/null
+++ b/packages/maemo-strongswan/debian/strongswan.install
@@ -0,0 +1,29 @@
+# config
+etc
+# libraries
+usr/lib/libstrongswan.so*
+usr/lib/libhydra.so*
+usr/lib/libcharon.so*
+# starter etc.
+usr/sbin/ipsec
+usr/lib/ipsec/starter
+usr/lib/ipsec/_copyright
+usr/share/man/man8/ipsec.8
+usr/share/man/man5/ipsec.conf.5
+usr/share/man/man5/ipsec.secrets.5
+# updown
+usr/lib/ipsec/_updown
+usr/lib/ipsec/_updown_espmark
+usr/share/man/man8/_updown.8
+usr/share/man/man8/_updown_espmark.8
+# charon
+usr/share/dbus-1/system-services
+usr/lib/ipsec/charon
+usr/lib/ipsec/stroke
+usr/share/man/man5/strongswan.conf.5
+# pluto
+usr/lib/ipsec/pluto
+usr/lib/ipsec/_pluto_adns
+usr/lib/ipsec/whack
+usr/lib/ipsec/plugins/libstrongswan-xauth.so*
+usr/share/man/man8/pluto.8