--- a/debian/rules	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/rules	Wed Jul 01 05:14:51 2009 +0000
@@ -37,6 +37,7 @@
 	    --build='$(DEB_BUILD_GNU_TYPE)' --prefix=/usr \
 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	    $(CONFFLAGS)
+	$(MAKE) clean
 
 build: deb-checkdir build-stamp
 build-stamp: config.status
@@ -55,19 +56,25 @@
 	rm -rf '$(DIR)'
 	rm -rf '$(DIR)'-client
 	rm -rf '$(DIR)'-server
-	rm -rf '$(DIR)'-common
+	rm -rf '$(DIR)'-keyutils
 	rm -rf '$(DIR)'-scp
 	rm -f debian/files debian/substvars debian/copyright changelog
 
 install-server: DIR=$(shell pwd)/debian/dropbear-server
 install-server: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
-	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS=dropbear dropbear
+	rm *.o
+	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbear dropbearkey dropbearconvert" MULTI=1
 	install -d -m0755 '$(DIR)'/etc/dropbear
 	# programs
+	install -d -m0755 '$(DIR)'/usr/bin
 	install -d -m0755 '$(DIR)'/usr/sbin
-	install -m0755 dropbear '$(DIR)'/usr/sbin/dropbear
+	install -d -m0755 '$(DIR)'/usr/lib/dropbear
+	install -m0755 dropbearmulti \
+	  '$(DIR)'/usr/lib/dropbear/dropbearmulti
+	ln -s ../lib/dropbear/dropbearmulti '$(DIR)'/usr/bin/dropbearkey
+	ln -s ../lib/dropbear/dropbearmulti '$(DIR)'/usr/sbin/dropbear
+	ln -s dropbearmulti '$(DIR)'/usr/lib/dropbear/dropbearconvert
 	# init and run scripts
 	install -d -m0755 '$(DIR)'/etc/init.d
 	install -m0755 debian/dropbear.init '$(DIR)'/etc/init.d/dropbear
@@ -83,18 +90,16 @@
 	# copyright, changelog
 	cat debian/copyright.in LICENSE > debian/copyright
 	test -r changelog || ln -s CHANGES changelog
-	$(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/*
+	$(STRIP) -R .comment -R .note '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/sbin/*
-	dpkg-gencontrol -isp -pdropbear-server -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
 install-client: DIR=$(shell pwd)/debian/dropbear-client
 install-client: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS=dbclient dbclient
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -m0755 dbclient '$(DIR)'/usr/bin/dbclient
@@ -106,13 +111,11 @@
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
 	  dpkg-shlibdeps  '$(DIR)'/usr/bin/*
-	dpkg-gencontrol -isp -pdropbear-client -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
 
-install-common: DIR=$(shell pwd)/debian/dropbear-common
-install-common: deb-checkdir deb-checkuid config.status 
+install-keyutils: DIR=$(shell pwd)/debian/dropbear-keyutils
+install-keyutils: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbearkey dropbearconvert" MULTI=1
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -d -m0755 '$(DIR)'/usr/lib/dropbear
@@ -126,18 +129,16 @@
 	done
 	gzip -9 '$(DIR)'/usr/share/man/man8/*.8
 	$(STRIP) -R .comment -R .note \
-	  '$(DIR)'/usr/bin/* '$(DIR)'/usr/lib/dropbear/*
+	   '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/bin/*  '$(DIR)'/usr/lib/dropbear/*
-	dpkg-gencontrol -isp -pdropbear-common -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
 install-scp: DIR=$(shell pwd)/debian/dropbear-scp
 install-scp: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="scp" scp 
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -m0755 scp '$(DIR)'/usr/bin/scp
@@ -146,13 +147,11 @@
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
 	  dpkg-shlibdeps '$(DIR)'/usr/bin/* 
-	dpkg-gencontrol -isp -pdropbear-scp -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
 
 install-multi: DIR=$(shell pwd)/debian/dropbear
 install-multi: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbearkey dropbearconvert scp dropbear dbclient" MULTI=1
 	install -d -m0755 '$(DIR)'/etc/dropbear
 	# programs
@@ -181,20 +180,26 @@
 	install -d -m0755 '$(DIR)'/usr/share/man/man1
 	install -m644 dbclient.1 '$(DIR)'/usr/share/man/man1/
 	gzip -9 '$(DIR)'/usr/share/man/man1/*.1
-	$(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/* \
-	  '$(DIR)'/usr/bin/* '$(DIR)'/usr/lib/dropbear/*
+	$(STRIP) -R .comment -R .note '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/sbin/* '$(DIR)'/usr/bin/* \
-	    '$(DIR)'/usr/lib/dropbear/*
-	dpkg-gencontrol -isp -pdropbear -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
-install: install-client install-server install-common install-multi install-scp
+install: install-client install-server install-keyutils install-multi install-scp
 binary-indep:
 
-binary-arch: install dropbear.deb dropbear-server.deb dropbear-common.deb dropbear-scp.deb dropbear-client.deb
+binary-arch: install dropbear.deb dropbear-server.deb dropbear-keyutils.deb dropbear-scp.deb dropbear-client.deb
+	dpkg-gencontrol -isp -pdropbear -P'$(shell pwd)/debian'/dropbear
+	dpkg-gencontrol -isp -pdropbear-server -P'$(shell pwd)/debian'/dropbear-server
+	dpkg-gencontrol -isp -pdropbear-client -P'$(shell pwd)/debian'/dropbear-client
+	dpkg-gencontrol -isp -pdropbear-keyutils -P'$(shell pwd)/debian'/dropbear-keyutils
+	dpkg-gencontrol -isp -pdropbear-scp -P'$(shell pwd)/debian'/dropbear-scp
+	dpkg -b '$(shell pwd)/debian'/dropbear ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-server ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-keyutils ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-scp ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-client ..
 
 binary: binary-arch binary-indep