diff --git a/debian/changelog b/debian/changelog
index 2c227fc7..c8b8363f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ llvm-toolchain-snapshot (1:7~svn323616-1~exp2) UNRELEASED; urgency=medium
   * Move the VCS to git.
     Many thanks to James Clarke for doing the conversion
   * Create the directory before having the manpages generated
+  * Automatically update the debian/README
 
   [ James Clarke ]
   * Disable LLDB on powerpcspe
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index b9749e11..432f8144 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -3,9 +3,12 @@ ORIG_VERSION=6.0
 TARGET_VERSION=7.0
 ORIG_VERSION_2=6_0
 TARGET_VERSION_2=7_0
+ORIG_VERSION_3=60
+TARGET_VERSION_3=70
 
-LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/clang-apply-replacements.diff debian/patches/fix-scan-view-path.diff debian/qualify-clang.sh`
+LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/clang-apply-replacements.diff debian/patches/fix-scan-view-path.diff debian/qualify-clang.sh debian/README`
 for F in $LIST; do
+    sed -i -e "s|$ORIG_VERSION_3|$TARGET_VERSION_3|g" $F
     sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
     sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F
 done
diff --git a/debian/rules b/debian/rules
index 8e6df5f9..158dffa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' bin
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 7.1.0-7~ || \
 	dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 7.2.0-2; echo $$?),0)
 # Only pass -gsplit-dwarf with working version of gcc 7
-# More: https://bugs.llvm.org/show_bug.cgi?id=34140 & https://bugs.debian.org/873609
+# More: https://bugs.llvm.org/show_bug.cgi?id=34140 & https://bugs.debian.org/873709
 CXXFLAGS_EXTRA += -gsplit-dwarf
 else
 $(error "Broken gcc version for -gsplit-dwarf support. Please use < gcc 7 or >= 7.2.0-2")