diff --git a/doc/Makefile.am b/doc/Makefile.am
index 390153c76..66a934cef 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -42,7 +42,7 @@ EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
              FAQ gnupg7.texi mkdefsinc.c defsincdate \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
 	     gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt \
-             trust-values.texi
+             trust-values.texi keyformat.txt
 
 BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \
                 gnupg-card-architecture.png gnupg-card-architecture.pdf \
diff --git a/agent/keyformat.txt b/doc/keyformat.txt
similarity index 100%
rename from agent/keyformat.txt
rename to doc/keyformat.txt