diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index 2801e790..7be800ef 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -1,4 +1,4 @@
-#build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1
+clang/docs/_build/man/clang-@LLVM_VERSION@.1
 clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1
 debian/man/clang-check-@LLVM_VERSION@.1
 debian/man/scan-view-@LLVM_VERSION@.1
diff --git a/debian/rules b/debian/rules
index e0ac9a0d..6b055e98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -269,7 +269,7 @@ override_dh_prep: build_doc
 
 build_doc:
 	cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
-	cd $(CURDIR)/tools/clang/docs && make -f Makefile.sphinx
+	cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
 
 # Rename manpages
 	d=$(CURDIR)/docs/_build/man/; \
@@ -278,6 +278,8 @@ build_doc:
 		echo "$$f"|grep $(LLVM_VERSION) || mv $$f `echo $$f|sed "s|\.1|-$(LLVM_VERSION).1|"`; \
 	done
 
+	cd $(CURDIR)/clang/docs/_build/man/; mv clang.1 clang-$(LLVM_VERSION).1
+
 # Remove the copy of jquery. See bug #701087
 	for d in $(CURDIR)/clang/docs/_build/html/_static/ $(CURDIR)/docs/_build/html/_static/; do \
 		cd $$d && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js; \
@@ -380,8 +382,6 @@ endif
 	done
 
 # Rename some stuff with the version name
-#	cp $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1
-
 	cp $(CURDIR)/clang/tools/scan-build/man/scan-build.1 $(CURDIR)/clang/tools/scan-build/man/scan-build-$(LLVM_VERSION).1
 
 	# copy the vim files (exept that tablegen does not exist for indent