11 files changed, 3 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index d8fab9fdda..18e250f35e 100644
--- a/configure.in
+++ b/configure.in
@@ -858,7 +858,7 @@ if test x$enable_gcc_warnings = xyes; then
 
 fi
 
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh)
 
 if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
   ./contrib/updateVersions.pl
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5e888d4d3e..2277b3dc0d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,15 +1,12 @@
 
-EXTRA_DIST = tor-spec.txt rend-spec.txt control-spec.txt     \
-             dir-spec.txt socks-extensions.txt path-spec.txt \
-             version-spec.txt address-spec.txt               \
-             website img HACKING                             \
+EXTRA_DIST = website img HACKING                             \
              tor-resolve.1                                   \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
              tor-win32-mingw-creation.txt
 
 man_MANS = tor.1 tor-resolve.1
 
-SUBDIRS = design-paper
+SUBDIRS = design-paper spec
 
 DIST_SUBDIRS = design-paper
 
diff --git a/doc/address-spec.txt b/doc/spec/address-spec.txt
index 2e83a68135..2e83a68135 100644
--- a/doc/address-spec.txt
+++ b/doc/spec/address-spec.txt
diff --git a/doc/control-spec-v0.txt b/doc/spec/control-spec-v0.txt
index faf75a64a4..faf75a64a4 100644
--- a/doc/control-spec-v0.txt
+++ b/doc/spec/control-spec-v0.txt
diff --git a/doc/control-spec.txt b/doc/spec/control-spec.txt
index 51cc6db50f..51cc6db50f 100644
--- a/doc/control-spec.txt
+++ b/doc/spec/control-spec.txt
diff --git a/doc/dir-spec.txt b/doc/spec/dir-spec.txt
index 70c164af32..70c164af32 100644
--- a/doc/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
diff --git a/doc/path-spec.txt b/doc/spec/path-spec.txt
index dc6d25331f..dc6d25331f 100644
--- a/doc/path-spec.txt
+++ b/doc/spec/path-spec.txt
diff --git a/doc/rend-spec.txt b/doc/spec/rend-spec.txt
index 8259ecec2f..8259ecec2f 100644
--- a/doc/rend-spec.txt
+++ b/doc/spec/rend-spec.txt
diff --git a/doc/socks-extensions.txt b/doc/spec/socks-extensions.txt
index 8097c66456..8097c66456 100644
--- a/doc/socks-extensions.txt
+++ b/doc/spec/socks-extensions.txt
diff --git a/doc/tor-spec.txt b/doc/spec/tor-spec.txt
index f27901ec82..f27901ec82 100644
--- a/doc/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
diff --git a/doc/version-spec.txt b/doc/spec/version-spec.txt
index 5b9aeee01b..5b9aeee01b 100644
--- a/doc/version-spec.txt
+++ b/doc/spec/version-spec.txt