diff --git a/README b/README
index 342376faf4..d246a6930e 100644
--- a/README
+++ b/README
@@ -26,4 +26,4 @@ Frequently Asked Questions:
 
 
 To get started working on Tor development:
-        See the doc/HACKING file.
+        See the doc/HACKING directory.
diff --git a/doc/GettingStarted.txt b/doc/HACKING/GettingStarted.txt
similarity index 100%
rename from doc/GettingStarted.txt
rename to doc/HACKING/GettingStarted.txt
diff --git a/doc/HACKING b/doc/HACKING/HACKING_old
similarity index 100%
rename from doc/HACKING
rename to doc/HACKING/HACKING_old
diff --git a/doc/WritingTests.txt b/doc/HACKING/WritingTests.txt
similarity index 100%
rename from doc/WritingTests.txt
rename to doc/HACKING/WritingTests.txt
diff --git a/doc/include.am b/doc/include.am
index f33103b68c..5decfe583d 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -34,13 +34,14 @@ nodist_man1_MANS =
 doc_DATA =
 endif
 
-EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh			\
+EXTRA_DIST+= doc/asciidoc-helper.sh			\
              $(html_in) $(man_in) $(txt_in)			\
              doc/state-contents.txt				\
              doc/torrc_format.txt 				\
 	     doc/TUNING						\
-	     doc/WritingTests.txt				\
-	     doc/GettingStarted.txt
+	     doc/HACKING/WritingTests.txt			\
+	     doc/HACKING/GettingStarted.txt			\
+	     doc/HACKING/HACKING_old
 
 docdir = @docdir@