diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in
index 50c6ed1a..d9b16344 100644
--- a/debian/clang-X.Y.install.in
+++ b/debian/clang-X.Y.install.in
@@ -10,7 +10,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace
 usr/bin/c-index-test*
 tools/clang/tools/scan-build-@LLVM_VERSION@      usr/share/clang/
 tools/clang/tools/scan-view-@LLVM_VERSION@       usr/share/clang/
-#usr/share/man/man1/clang.1	usr/share/man/man1/
 
 usr/bin/clang-@LLVM_VERSION@
 usr/bin/clang++-@LLVM_VERSION@
diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in
index d1b6df0e..a07b5ee3 100644
--- a/debian/clang-X.Y.manpages.in
+++ b/debian/clang-X.Y.manpages.in
@@ -1,6 +1,5 @@
-build-llvm/tools/clang/docs/tools/clang.1
-clang/tools/scan-build/scan-build.1
-debian/man/clang-check.1
-debian/man/clang-tblgen.1
-debian/man/scan-view.1
-
+build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1
+clang/tools/scan-build/scan-build-@LLVM_VERSION@.1
+debian/man/clang-check-@LLVM_VERSION@.1
+debian/man/clang-tblgen-@LLVM_VERSION@.1
+debian/man/scan-view-@LLVM_VERSION@.1
diff --git a/debian/rules b/debian/rules
index abdd653f..8ee7ca93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -252,11 +252,11 @@ build_doc:
 		cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js; \
 	done
 
-	help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/scan-view > debian/man/scan-view.1
+	help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
 	help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
 
 	for f in clang clang-tblgen clang-check; do \
-		help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f.1; \
+		help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/Release/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
 	done
 
 	for f in llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-tblgen macho-dump lldb clang-format clang-modernize; do \
@@ -310,9 +310,10 @@ override_dh_auto_install:
 	done
 
 # Rename some stuff with the version name
-	# WILL DO when we can install several clang versions together
-	#mv $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang.1 $(CURDIR)/$(TARGET_BUILD)/tools/clang/docs/tools/clang-$(LLVM_VERSION).1
-
+	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/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1
+		
 	cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim
 
 	cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim