diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
index 0dc7bf88..82d38364 100644
--- a/debian/patches/19-clang_debian_version.patch
+++ b/debian/patches/19-clang_debian_version.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/Version.cpp
+Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
 ===================================================================
---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/Basic/Version.cpp
-+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/Version.cpp
+--- llvm-toolchain-snapshot_11~++20200708031542+64363a9d930.orig/clang/lib/Basic/Version.cpp
++++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
 @@ -14,6 +14,7 @@
  #include "clang/Basic/LLVM.h"
  #include "clang/Config/config.h"
@@ -14,8 +14,8 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/V
  #ifdef CLANG_VENDOR
    OS << CLANG_VENDOR;
  #endif
--  OS << ToolName << " version " CLANG_VERSION_STRING " "
+-  OS << ToolName << " version " CLANG_VERSION_STRING;
 +  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
-      << getClangFullRepositoryVersion();
  
-   return OS.str();
+   std::string repo = getClangFullRepositoryVersion();
+   if (!repo.empty()) {
diff --git a/debian/patches/print-lldb-path.patch b/debian/patches/print-lldb-path.patch
index 780b6025..948b2e2a 100644
--- a/debian/patches/print-lldb-path.patch
+++ b/debian/patches/print-lldb-path.patch
@@ -1,11 +1,11 @@
 Author: Gianfranco Costamagna <locutusofborg@debian.org>
 Last-Update: 2020-01-21
 
-Index: llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
 ===================================================================
---- llvm-toolchain-snapshot_11~++20200409051253+d08105482e1.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-+++ llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
-@@ -371,6 +371,8 @@ void ScriptInterpreterPython::ComputePyt
+--- llvm-toolchain-snapshot_11~++20200708031542+64363a9d930.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
++++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+@@ -365,6 +365,8 @@ void ScriptInterpreterPython::ComputePyt
    // x86_64, or bin on Windows).
    llvm::sys::path::remove_filename(path);
    llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);