diff --git a/Makefile.am b/Makefile.am
index 1a566b9ae..d9a67eb6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,6 @@ pkgconfigdir   = $(libdir)/pkgconfig
 EXTRA_DIST = 				\
 	ChangeLog.pre-git-import	\
 	clutter.pc.in 			\
-	HACKING 			\
-	HACKING.backends 		\
-	CODING_STYLE			\
 	$(NULL)
 
 CLEANFILES = $(pcfiles)
diff --git a/CODING_STYLE b/doc/CODING_STYLE
similarity index 100%
rename from CODING_STYLE
rename to doc/CODING_STYLE
diff --git a/HACKING b/doc/HACKING
similarity index 100%
rename from HACKING
rename to doc/HACKING
diff --git a/HACKING.backends b/doc/HACKING.backends
similarity index 100%
rename from HACKING.backends
rename to doc/HACKING.backends
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a80cfc009..cb85d8f91 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,3 +9,8 @@ SUBDIRS += common cookbook manual
 endif
 
 DIST_SUBDIRS = reference common cookbook manual
+
+EXTRA_DIST = \
+	CODING_STYLE \
+	HACKING \
+	HACKING.backends