diff --git a/doc/mksamplekeys b/doc/mksamplekeys
index e5db52c2a..9c2b59636 100755
--- a/doc/mksamplekeys
+++ b/doc/mksamplekeys
@@ -4,9 +4,7 @@
 keys="1E42B367 4F25E3B6 5B0358A2 57548DCD 99242560 CA57AD7C B2D7795E 1CE0C630"
 
 for i in $keys; do
-  gpg --list-keys $i | awk ' ( $0 != "") { print "  " $0 }'
+  gpg --list-keys $i | awk '{ if ( $0 != "") print "  " $0; else print $0; }'
 done
 echo
 gpg --export-options export-minimal --export -a $keys
-
-
diff --git a/doc/samplekeys.asc b/doc/samplekeys.asc
index 4d16c10c2..a6ea4cb40 100644
--- a/doc/samplekeys.asc
+++ b/doc/samplekeys.asc
@@ -3,25 +3,31 @@
   uid                  Werner Koch <wk@g10code.com>
   sub   1024D/77F95F95 2011-11-02
   sub   2048R/C193565B 2011-11-07 [expires: 2013-12-31]
+
   pub   2048R/4F25E3B6 2011-01-12 [expires: 2019-12-31]
   uid                  Werner Koch (dist sig)
   sub   2048R/AC87C71A 2011-01-12 [expires: 2019-12-31]
+
   pub   1024D/5B0358A2 1999-03-15 [expired: 2011-07-11]
   uid                  Werner Koch <wk@gnupg.org>
   uid                  Werner Koch <wk@g10code.com>
   uid                  Werner Koch
   uid                  Werner Koch <werner@fsfe.org>
+
   pub   1024D/57548DCD 1998-07-07 [expired: 2005-12-31]
   uid                  Werner Koch (gnupg sig) <dd9jn@gnu.org>
+
   pub   4096R/99242560 2002-01-28
   uid                  David M. Shaw <dshaw@jabberwocky.com>
   sub   2048R/A1BC4FA4 2012-01-10 [expires: 2017-01-31]
   sub   2048R/6F410A43 2012-01-10 [expires: 2017-01-31]
+
   pub   2048R/CA57AD7C 2004-12-06
   uid                  PGP Global Directory Verification Key
   uid                  [jpeg image of size 3400]
   uid                  DNR KS1 <do-not-reply@keyserver1.pgp.com>
   uid                  DNR-KS2 <do-not-reply@keyserver2.pgp.com>
+
   pub   1024D/B2D7795E 2001-01-04
   uid                  Philip R. Zimmermann <prz@mit.edu>
   uid                  Philip R. Zimmermann <prz@acm.org>
@@ -29,9 +35,11 @@
   uid                  [jpeg image of size 3457]
   uid                  Philip R. Zimmermann <prz@philzimmermann.com>
   sub   3072g/A8E92834 2001-01-04
+
   pub   1024R/1CE0C630 2006-01-01 [expired: 2011-06-30]
   uid                  Werner Koch (dist sig) <dd9jn@gnu.org>
 
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)