=== modified file 'Makefile'
--- Makefile	2008-08-24 06:17:02 +0000
+++ Makefile	2008-08-25 03:53:42 +0000
@@ -87,19 +87,39 @@
 distclean: clean
 mostlyclean: clean
 maintainer-clean: clean
-	-rm --force --recursive keydir
+	-rm --force --recursive keydir confdir
 
 check:
 	./mandos --check
 
-run-client: all
-	-mkdir keydir
-	-./mandos-keygen --dir keydir
+# Run the server with a local key
+run-client: all keydir/seckey.txt keydir/pubkey.txt \
+	keydir/secring.gpg keydir/pubring.gpg
 	./plugin-runner --plugin-dir=plugins.d \
 		--options-for=password-request:--keydir=keydir
 
-run-server:
-	./mandos --debug --configdir=.
+# Used by run-client
+keydir/secring.gpg: keydir/seckey.txt
+	gpg --homedir $(dir $<) --import $^
+keydir/pubring.gpg: keydir/pubkey.txt
+	gpg --homedir $(dir $<) --import $^
+keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
+	install --directory keydir
+	./mandos-keygen --dir keydir --force
+
+# Run the server with a local config
+run-server: confdir/mandos.conf confdir/clients.conf
+	./mandos --debug --configdir=confdir
+
+# Used by run-server
+confdir/mandos.conf: mandos.conf
+	install --directory confdir
+	install $^ $@
+confdir/clients.conf: clients.conf keydir/seckey.txt
+	install --directory confdir
+	install clients.conf $@
+# Add a client password
+	./mandos-keygen --dir keydir --password >> $@
 
 install: install-server install-client
 

=== modified file 'mandos-keygen'
--- mandos-keygen	2008-08-25 01:16:38 +0000
+++ mandos-keygen	2008-08-25 03:53:42 +0000
@@ -24,7 +24,7 @@
 
 KEYDIR="/etc/mandos"
 KEYTYPE=DSA
-KEYLENGTH=1024
+KEYLENGTH=2048
 SUBKEYTYPE=ELG-E
 SUBKEYLENGTH=2048
 KEYNAME="`hostname --fqdn`"
@@ -56,7 +56,7 @@
   -d DIR, --dir DIR     Target directory for key files
   -t TYPE, --type TYPE  Key type.  Default is DSA.
   -l BITS, --length BITS
-                        Key length in bits.  Default is 1024.
+                        Key length in bits.  Default is 2048.
   -s TYPE, --subtype TYPE
                         Subkey type.  Default is ELG-E.
   -L BITS, --sublength BITS

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-08-24 07:42:14 +0000
+++ mandos-keygen.xml	2008-08-25 03:53:42 +0000
@@ -256,7 +256,7 @@
 	<replaceable>bits</replaceable></literal></term>
 	<listitem>
 	  <para>
-	    Key length in bits.  Default is 1024.
+	    Key length in bits.  Default is 2048.
 	  </para>
 	</listitem>
       </varlistentry>