diff --git a/debian/changelog b/debian/changelog
index b59bfd5e..eda29c05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-llvm-toolchain-snapshot (1:7~svn323616-1~exp2) experimental; urgency=medium
+llvm-toolchain-snapshot (1:7~svn323616-1~exp2) UNRELEASED; urgency=medium
 
+  * create the directory for the mips stuff
   * Fail the build when new symbols are added
   * 5 new symbols:
     - clang_PrintingPolicy_dispose
@@ -7,6 +8,7 @@ llvm-toolchain-snapshot (1:7~svn323616-1~exp2) experimental; urgency=medium
     - clang_PrintingPolicy_setProperty
     - clang_getCursorPrettyPrinted
     - clang_getCursorPrintingPolicy
+  * Use upstream ld.lld manpage instead of help2man
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Feb 2018 17:32:45 +0100
 
diff --git a/debian/lld-X.Y.manpages.in b/debian/lld-X.Y.manpages.in
index 51943dc6..cafe16f1 100644
--- a/debian/lld-X.Y.manpages.in
+++ b/debian/lld-X.Y.manpages.in
@@ -1 +1,2 @@
-debian/man/ld.lld-@LLVM_VERSION@.1
+lld/docs/ld.lld-@LLVM_VERSION@.1
+
diff --git a/debian/rules b/debian/rules
index 4a4c6d5b..3d7f75ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -494,6 +494,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps -l$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ -Xlibclang_rt.asan -Xlibclang_rt.asan -Xlibclang_rt.asan-*.so -Xlibclang_rt.asan-*.so
 
 override_dh_installman:
+	mv lld/docs/ld.lld.1 lld/docs/ld.lld-@LLVM_VERSION@.1
 	dh_installman
 # Make sure that lli manpage is only in llvm-3.2-runtime (See #697117)
 	rm -f $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/share/man/man1/lli*