diff --git a/debian/changelog b/debian/changelog
index 496a3306..90c6a55f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-llvm-toolchain-snapshot (1:3.9~svn260815-1~exp1) experimental; urgency=medium
-
-  * New snapshot release
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 13 Feb 2016 15:12:42 +0100
-
 llvm-toolchain-snapshot (1:3.9~svn260089-1) unstable; urgency=medium
 
   * New snapshot
@@ -28,6 +22,8 @@ llvm-toolchain-snapshot (1:3.9~svn260089-1) unstable; urgency=medium
     - removed llvm-X.Y-tools (contained only internal tools)
     - removed autotools-specific artifacts (configure, Makefile, etc.)
     - removed dummy documentation files
+  * Sync against 3.8
+  * Disable "Sphinx warnings treated as errors"
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 16 Jan 2016 12:34:11 +0100
 
diff --git a/debian/rules b/debian/rules
index 18a36244..ec93ad95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -238,6 +238,7 @@ override_dh_auto_configure: preconfigure
 		-DLLVM_LINK_LLVM_DYLIB=ON \
 		-DLLVM_VERSION_SUFFIX= \
 		-DLLVM_ENABLE_SPHINX=ON \
+                -DSPHINX_WARNINGS_AS_ERRORS=OFF \
 		-DLLVM_BUILD_LLVM_DYLIB=ON \
 		-DLLVM_ENABLE_RTTI=ON \
 		-DLLVM_ENABLE_FFI=ON \