diff -Nru doxygen-1.8.12/debian/changelog doxygen-1.8.12/debian/changelog
--- doxygen-1.8.12/debian/changelog	2016-09-08 16:22:12.000000000 +0000
+++ doxygen-1.8.12/debian/changelog	2016-11-20 11:18:48.000000000 +0000
@@ -1,3 +1,9 @@
+doxygen (1.8.12-1+rpi1) stretch-staging; urgency=medium
+
+  * Revert to llvm/clang 3.8 as 3.9 is killing our buildboxes.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 20 Nov 2016 11:18:48 +0000
+
 doxygen (1.8.12-1) unstable; urgency=medium
 
   * doxygen 1.8.12 release.
diff -Nru doxygen-1.8.12/debian/control doxygen-1.8.12/debian/control
--- doxygen-1.8.12/debian/control	2016-09-08 16:21:28.000000000 +0000
+++ doxygen-1.8.12/debian/control	2016-11-20 11:18:35.000000000 +0000
@@ -12,8 +12,8 @@
   cmake,
   yui-compressor,
   ruby-compass,
-  llvm-3.9-dev [alpha amd64 armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x],
-  libclang-3.9-dev [alpha amd64 armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x]
+  llvm-3.8-dev [alpha amd64 armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x],
+  libclang-3.8-dev [alpha amd64 armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x]
 Build-Depends-Indep: texlive-fonts-recommended,
   texlive-generic-recommended,
   texlive-latex-extra,
diff -Nru doxygen-1.8.12/debian/rules doxygen-1.8.12/debian/rules
--- doxygen-1.8.12/debian/rules	2016-09-08 16:21:41.000000000 +0000
+++ doxygen-1.8.12/debian/rules	2016-11-20 11:17:49.000000000 +0000
@@ -18,7 +18,7 @@
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-export LLVM_CONFIG = llvm-config-3.9
+export LLVM_CONFIG = llvm-config-3.8
 
 clang_archs = alpha amd64 armhf arm64 i386 mips mipsel \
 	powerpc powerpcspe ppc64 ppc64el s390x \