diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a073c91080..05491fe1ea 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = tor-tsocks.conf torify.1 tor-resolve.1 tor.spec tor-resolve
 
 conf_DATA = tor-tsocks.conf
 
-bin_SCRIPTS = torify tor-resolve
+bin_SCRIPTS = torify
 
-man_MANS = torify.1 tor-resolve.1
+man_MANS = torify.1
diff --git a/contrib/tor-resolve b/contrib/tor-resolve.py
similarity index 100%
rename from contrib/tor-resolve
rename to contrib/tor-resolve.py
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d0a0307d2e..83bb0c428d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-doc.html tor-doc.css
 
-man_MANS = tor.1
+man_MANS = tor.1 tor-resolve.1
 
 SUBDIRS = design-paper
 
diff --git a/contrib/tor-resolve.1 b/doc/tor-resolve.1
similarity index 100%
rename from contrib/tor-resolve.1
rename to doc/tor-resolve.1