diff --git a/debian/changelog b/debian/changelog
index 1fea7f45..211f7d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-llvm-toolchain-3.8 (1:3.8~+rc2-2~exp1) UNRELEASED; urgency=medium
+llvm-toolchain-3.8 (1:3.8~+rc3-1~exp1) experimental; urgency=medium
 
+  * New snapshot release
   * Update the clang description for something more accurate (C++-11, 14, etc)
   * Update debian/orig-tar.sh to remove autoconf/config.sub autoconf/config.guess
     in polly
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 07 Feb 2016 17:15:39 +0100
+  [ Matthias Klose ]
+  * clang-tidy-3.8: Remove Breaks/Replaces on clang-modernize-3.8.
+  * Disable lldb on s390x.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 25 Feb 2016 14:26:14 +0100
 
 llvm-toolchain-3.8 (1:3.8~+rc2-1~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 734d1a1b..ab889bc2 100644
--- a/debian/control
+++ b/debian/control
@@ -59,8 +59,8 @@ Description: Tool to format C/C++/Obj-C code
 Package: clang-tidy-3.8
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python
-Replaces: clang-modernize-3.8, clang-3.8 (<< 1:3.8~svn250696-1)
-Breaks: clang-modernize-3.8, clang-3.8 (<< 1:3.8~svn250696-1)
+Replaces: clang-3.8 (<< 1:3.8~svn250696-1)
+Breaks: clang-3.8 (<< 1:3.8~svn250696-1)
 Description: clang-based C++ linter tool
  Provide an extensible framework for diagnosing and fixing typical programming
  errors, like style violations, interface misuse, or bugs that can be deduced
@@ -352,7 +352,7 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lldb -------------
 
 Package: lldb-3.8
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), python, llvm-3.8-dev, python-lldb-3.8
 Conflicts: lldb-3.4, lldb-3.5
@@ -363,7 +363,7 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-3.8
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
@@ -408,7 +408,7 @@ Description: Next generation, high-performance debugger, python lib
 
 Package: liblldb-3.8-dev
 Section: libdevel
-Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
 # ia64 mips mipsel hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
 Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
diff --git a/debian/rules b/debian/rules
index 8d2fc324..be4f96e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,7 +122,7 @@ endif
 
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc
+LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.