diff --git a/debian/changelog b/debian/changelog
index b3a3cf65..d5f8143e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-3.7 (1:3.7~+rc3-2) UNRELEASED; urgency=medium
+
+  * Team Upload
+  * d/control: Add more conflicting packages (clang and lldb)
+    (Closes: #796811, #796843)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Aug 2015 15:56:17 +0200
+
 llvm-toolchain-3.7 (1:3.7~+rc3-1) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index 9dbb479f..2d65e7c7 100644
--- a/debian/control
+++ b/debian/control
@@ -172,8 +172,8 @@ Package: python-clang-3.7
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
-Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6
+Replaces: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.8
+Breaks: python-clang-3.3, python-clang-3.4, python-clang-3.5, python-clang-3.6, python-clang-3.8
 Description: Clang Python Bindings
  Clang project is a C, C++, Objective C and Objective C++ front-end
  for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler
@@ -218,7 +218,7 @@ Package: libllvm3.7-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.7 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Modular compiler and toolchain technologies, debugging libraries
@@ -412,7 +412,7 @@ Package: python-lldb-3.7
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6
+Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.8
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, python lib
  LLDB is a next generation, high-performance debugger. It is built as a set of