diff --git a/debian/changelog b/debian/changelog
index ad181fd8..bb76327d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
 llvm-toolchain-7 (1:7.0.1-5) unstable; urgency=medium
 
-<<<<<<<
   * Add 'Rules-Requires-Root: no' in debian/control
-=======
   * llvm-7-examples: Force the same version of llvm-7-dev to mitigate
     a debci issue
     https://ci.debian.net/data/autopkgtest/unstable/amd64/l/llvm-toolchain-7/1635547/log.gz
   * Add 'Rules-Requires-Root: no' in debian/control
   * Because more and more tools in clang-tools are in python, add
     the dependency
->>>>>>>
+  * Remove 'Multi-Arch: same' in libclang
+    (Closes: #874248)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 04 Jan 2019 16:00:41 +0100
 
@@ -637,12 +636,24 @@ llvm-toolchain-snapshot (1:7~svn322880-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jan 2018 20:50:03 +0100
 
-llvm-toolchain-6.0 (1:6.0.1-10) UNRELEASED; urgency=medium
+llvm-toolchain-6.0 (1:6.0.1-10) unstable; urgency=medium
+
+  * Fix a baseline violation on armhf (Closes: #914268)
+    Thanks to Adrian Bunk
+    doing that for the Julia package.
 
   [ John Paul Adrian Glaubitz ]
   * Add patch to fix missing include and library paths on x32
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Oct 2018 16:43:31 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 23 Jan 2019 23:25:50 +0100
+
+llvm-toolchain-6.0 (1:6.0.1-9.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/D53557-hurd-self-exe-realpath.diff: Fix paths returned by
+    llvm-config (Closes: Bug#911817).
+
+ -- Samuel Thibault <sthibault@debian.org>  Wed, 24 Oct 2018 22:44:54 +0000
 
 llvm-toolchain-6.0 (1:6.0.1-9.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7d6e4a16..f22d5233 100644
--- a/debian/control
+++ b/debian/control
@@ -105,7 +105,6 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: C interface to the Clang library
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the