diff -Nru llvm-toolchain-4.0-4.0/debian/changelog llvm-toolchain-4.0-4.0/debian/changelog
--- llvm-toolchain-4.0-4.0/debian/changelog	2017-03-09 06:51:53.000000000 +0000
+++ llvm-toolchain-4.0-4.0/debian/changelog	2017-03-13 16:54:08.000000000 +0000
@@ -1,3 +1,10 @@
+llvm-toolchain-4.0 (1:4.0-1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Don't build the Fuzzer library on powerpc.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 13 Mar 2017 17:52:51 +0100
+
 llvm-toolchain-4.0 (1:4.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -10,6 +17,12 @@
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 08 Mar 2017 08:52:37 +0100
 
+llvm-toolchain-4.0 (1:4.0~+rc3-1ubuntu1) zesty; urgency=medium
+
+  * Don't build the Fuzzer library on powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Mar 2017 17:04:00 +0100
+
 llvm-toolchain-4.0 (1:4.0~+rc3-1) unstable; urgency=medium
 
   * New testing release
@@ -1598,3 +1611,4 @@
     Thanks to Matthias Klose.
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 09 Feb 2013 12:14:10 +0100
+
diff -Nru llvm-toolchain-4.0-4.0/debian/rules llvm-toolchain-4.0-4.0/debian/rules
--- llvm-toolchain-4.0-4.0/debian/rules	2017-01-14 12:51:51.000000000 +0000
+++ llvm-toolchain-4.0-4.0/debian/rules	2017-03-09 16:19:07.000000000 +0000
@@ -140,6 +140,13 @@
 
 LLD_ENABLE=yes
 
+# Enable Fuzzer (or not)
+FUZZER_ENABLE=yes
+ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
+	FUZZER_ENABLE=no
+	CMAKE_EXTRA += -DLLVM_ENABLE_FUZZER=OFF
+endif
+
 %:
 	dh $@ --with ocaml
 
@@ -259,12 +266,14 @@
 
 override_dh_auto_build:
 	$(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)"  LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1
+ifeq ($(FUZZER_ENABLE),yes)
 	cd $(TARGET_BUILD) \
 	CFLAGS=`dpkg-buildflags --get CFLAGS`; \
 	CFLAGS="$$CFLAGS `dpkg-buildflags --get CPPFLAGS`"; \
 	echo $$CFLAGS; \
 	bin/clang++ -c $$CFLAGS -std=c++11 ../lib/Fuzzer/*.cpp -IFuzzer; \
 	ar ruv libFuzzer.a Fuzzer*.o
+endif
 
 override_dh_prep: build_doc
 	dh_prep
@@ -330,8 +339,10 @@
 	mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/
 	cp compiler-rt/lib/asan/scripts/asan_symbolize.py $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/asan_symbolize-$(LLVM_VERSION)
 
+ifeq ($(FUZZER_ENABLE),yes)
 	mkdir -p $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/
 	cp -v $(TARGET_BUILD)/libFuzzer.a $(CURDIR)/debian/libfuzzer-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/
+endif
 
 # Create this fake directory to make the install libclang-common-dev happy
 # under the unsupported archs of compiler-rt