diff --git a/BUGS b/Documentation/BUGS
similarity index 100%
rename from BUGS
rename to Documentation/BUGS
diff --git a/CodingStyle b/Documentation/CodingStyle
similarity index 100%
rename from CodingStyle
rename to Documentation/CodingStyle
diff --git a/FAQ b/Documentation/FAQ
similarity index 100%
rename from FAQ
rename to Documentation/FAQ
diff --git a/TODO b/Documentation/TODO
similarity index 100%
rename from TODO
rename to Documentation/TODO
diff --git a/Makefile.am b/Makefile.am
index 2b7c3b41..06b70ed4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,12 +77,13 @@ sysconf_DATA = sysctl.conf
 
 EXTRA_DIST = \
 	autogen.sh \
-	CodingStyle \
 	contrib \
 	COPYING.LIB \
+	Documentation/CodingStyle \
+	Documentation/TODO \
 	$(sysconf_DATA)
 
 procpsngdir = $(docdir)
 dist_procpsng_DATA = \
-	BUGS \
-	FAQ
+	Documentation/BUGS \
+	Documentation/FAQ