diff --git a/Makefile.am b/Makefile.am
index 5f8aeeddfe..155b2557e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
  # else it keeps trying to put COPYING back in
 
-SUBDIRS = src doc
+SUBDIRS = src doc contrib
 
-DIST_SUBDIRS = src doc
+DIST_SUBDIRS = src doc contrib
 
 EXTRA_DIST = INSTALL README AUTHORS LICENSE ChangeLog
 
diff --git a/configure.in b/configure.in
index bbf729d3e3..69bf1d9168 100644
--- a/configure.in
+++ b/configure.in
@@ -184,5 +184,5 @@ AC_SUBST(LOCALSTATEDIR)
 
 echo "confdir: $CONFDIR"
 
-AC_OUTPUT(Makefile contrib/tor.sh contrib/torify src/config/torrc doc/tor.1 src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)
+AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc doc/tor.1 src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)