=== modified file 'Makefile'
--- Makefile	2009-11-01 00:10:28 +0000
+++ Makefile	2009-11-19 18:31:28 +0000
@@ -17,7 +17,6 @@
 # If BROKEN_PIE is set, do not build with -pie
 ifndef BROKEN_PIE
 FORTIFY += -fPIE
-LINK_FORTIFY_LD += -fPIE
 LINK_FORTIFY += -pie
 endif
 #COVERAGE=--coverage

=== modified file 'mandos-keygen'
--- mandos-keygen	2009-10-26 21:16:16 +0000
+++ mandos-keygen	2009-11-19 18:31:28 +0000
@@ -278,7 +278,7 @@
     
     # Get fingerprint of key
     FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
-	--enable-dsa2 --homedir '"'$RINGDIR'"' --trust-model always \
+	--enable-dsa2 --homedir \"$RINGDIR\" --trust-model always \
 	--fingerprint --with-colons \
 	| sed --quiet \
 	--expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"