diff --git a/debian/changelog b/debian/changelog
index 4af7d28f..d2723b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+llvm-toolchain-3.8 (1:3.8.1-8) unstable; urgency=medium
+
+  * Disable the usage of ld gold on powerpc (Closes: #833583)
+  * Revert drop-avx512-from-skylake.diff, it is causing some regressions in the
+    testsuite
+  * Disable lldb on ppc64
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 07 Aug 2016 14:10:09 +0200
+
 llvm-toolchain-3.8 (1:3.8.1-7) unstable; urgency=medium
 
   * Fix the detection of gcc. This broke the build on the latest unstable
diff --git a/debian/control b/debian/control
index 31325eaa..97461b03 100644
--- a/debian/control
+++ b/debian/control
@@ -393,8 +393,8 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lldb -------------
 
 Package: lldb-3.8
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel mips64el
-# ia64 hurd powerpc ppc64el sparc64  have been removed
+Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el sparc64  ppc64  have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev
 Suggests: python-lldb-3.8
 Conflicts: lldb-3.4, lldb-3.5
@@ -405,8 +405,8 @@ 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 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel mips64el
-# ia64 hurd powerpc ppc64el sparc64  have been removed
+Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el sparc64 ppc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -420,8 +420,8 @@ Description: Next generation, high-performance debugger, library
  This package contains the LLDB runtime library.
 
 Package: liblldb-3.8-dbg
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel mips64el
-# ia64 hurd ppc64el alpha s390x powerpc sparc64  have been removed
+Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel mips64el
+# ia64 hurd ppc64el alpha s390x powerpc sparc64  ppc64 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: debug
@@ -436,7 +436,7 @@ Description: Next generation, high-performance debugger, debugging libraries
 
 Package: python-lldb-3.8
 Section: python
-Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel mips64el
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel mips64el
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8-dev, python, python-six
 Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
 Pre-Depends: ${misc:Pre-Depends}
@@ -450,8 +450,8 @@ 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 sparc alpha hppa m68k powerpcspe ppc64 sh4 x32 mips mipsel mips64el
-# ia64 hurd powerpc ppc64el sparc64  have been removed
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el sparc64  ppc64  have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
 Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
 Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2)
diff --git a/debian/patches/drop-avx512-from-skylake.diff b/debian/patches/drop-avx512-from-skylake.diff
deleted file mode 100644
index b1d2cbb8..00000000
--- a/debian/patches/drop-avx512-from-skylake.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/lib/Target/X86/X86.td
-+++ b/lib/Target/X86/X86.td
-@@ -487,13 +487,7 @@ def : KnightsLandingProc<"knl">;
- // FIXME: define SKX model
- class SkylakeProc<string Name> : ProcessorModel<Name, HaswellModel, [
-   FeatureMMX,
--  FeatureAVX512,
-   FeatureFXSR,
--  FeatureCDI,
--  FeatureDQI,
--  FeatureBWI,
--  FeatureVLX,
--  FeaturePKU,
-   FeatureCMPXCHG16B,
-   FeatureSlowBTMem,
-   FeaturePOPCNT,
diff --git a/debian/patches/series b/debian/patches/series
index b2bc5397..362c252a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,6 +42,5 @@ llvm26003-sanitizer-check-env.diff
 scan-view-fix-path.diff
 mips-fpxx-enable.diff
 lldb-link-atomic-cmake.patch
-drop-avx512-from-skylake.diff
 D17567-PR23529-Sema-part-of-attrbute-abi_tag-support.diff
 D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.diff
diff --git a/debian/rules b/debian/rules
index 70f2c8ee..27ed25b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ else
 	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
 endif
 
-BINUTILS_GOLD_ARCHS := amd64 armhf i386 powerpc powerpcspe ppc64 ppc64el sparc sparc64 x32
+BINUTILS_GOLD_ARCHS := amd64 armhf i386 powerpcspe ppc64 ppc64el sparc sparc64 x32
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 # -fused-ld=gold enables the gold linker (but is not supported by all archs / distro)
@@ -123,7 +123,7 @@ endif
 
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64
+LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x sparc64 ppc64
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.