diff --git a/debian/changelog b/debian/changelog
index d546855b..79985b3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,17 @@ llvm-toolchain-snapshot (1:4.0~svn288822-1~exp1) experimental; urgency=medium
   * New snapshot release
   * d/p/kfreebsd-support.diff removed (applied upstream)
   * debian/orig-tar.sh: less verbose
+  * New symbols in libclang1:
+    - clang_EvalResult_getAsLongLong
+    - clang_EvalResult_getAsLongLong
+    - clang_EvalResult_isUnsignedInt
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 06 Dec 2016 17:54:39 +0100
 
 llvm-toolchain-snapshot (1:4.0~svn286225-1) unstable; urgency=medium
 
   * New snapshot release
+  * Remove the info section from the generated manpages (Closes: #846269)
 
   [ Kai Wasserbäch ]
   * debian/patches/{0003-Debian-version-info-and-bugreport.patch,
diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in
index 0bd8e9a4..06827b49 100644
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@@ -70,8 +70,11 @@ libclang-@LLVM_VERSION@.so.1 libclang1-@LLVM_VERSION@ #MINVER#
  clang_EvalResult_dispose@Base 3.9
  clang_EvalResult_getAsDouble@Base 3.9
  clang_EvalResult_getAsInt@Base 3.9
+ clang_EvalResult_getAsLongLong@Base 4.0
  clang_EvalResult_getAsStr@Base 3.9
+ clang_EvalResult_getAsUnsigned@Base 4.0
  clang_EvalResult_getKind@Base 3.9
+ clang_EvalResult_isUnsignedInt@Base 4.0
  clang_File_isEqual@Base 3.6
  clang_FullComment_getAsHTML@Base 3.2
  clang_FullComment_getAsXML@Base 3.2
diff --git a/debian/rules b/debian/rules
index 97866221..1df5f9d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -291,13 +291,13 @@ build_doc:
 		cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js && cd -; \
 	done
 
-	help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
-	help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
+	help2man --version-string=$(LLVM_VERSION) --no-discard-stderr clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1
+	help2man --version-string=$(LLVM_VERSION) --no-discard-stderr clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1
 
 	CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements clang-rename clang-query pp-trace sancov lli modularize clang-include-fixer find-all-symbols clang-reorder-fields"; \
 	for f in $$CMDS; do \
 		echo "Generating manpage of $$f"; \
-		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
+		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --version-string=$(LLVM_VERSION) --no-discard-stderr $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \
 	done
 
 override_dh_auto_install: