=== modified file 'Makefile'
--- Makefile	2010-09-12 03:22:48 +0000
+++ Makefile	2010-09-13 05:56:48 +0000
@@ -265,6 +265,8 @@
 		mandos.conf
 	install --mode=u=rw --target-directory=$(CONFDIR) \
 		clients.conf
+	install --mode=u=rw,go=r dbus-mandos.conf \
+		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 	install --mode=u=rwx,go=rx init.d-mandos \
 		$(DESTDIR)/etc/init.d/mandos
 	install --mode=u=rw,go=r default-mandos \
@@ -378,6 +380,7 @@
 
 purge-server: uninstall-server
 	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
+		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
 		$(DESTDIR)/etc/default/mandos \
 		$(DESTDIR)/etc/init.d/mandos \
 		$(DESTDIR)/var/run/mandos.pid

=== modified file 'mandos-keygen'
--- mandos-keygen	2010-09-09 18:16:14 +0000
+++ mandos-keygen	2010-09-13 06:19:45 +0000
@@ -293,12 +293,13 @@
 	stty -echo
 	echo -n "Enter passphrase: " >&2
 	first="$(head --lines=1 | tr --delete '\n')"
-	echo -n -e "\nRepeat passphrase: " >&2
+	echo >&2
+	echo -n "Repeat passphrase: " >&2
 	second="$(head --lines=1 | tr --delete '\n')"
 	echo >&2
 	stty echo
 	if [ "$first" != "$second" ]; then
-	    echo -e "Passphrase mismatch" >&2
+	    echo "Passphrase mismatch" >&2
 	    touch "$RINGDIR"/mismatch
 	else
 	    echo -n "$first"