---
 configure                   |    2 +-
 lib/Support/CommandLine.cpp |    3 +++
 lib/Support/Makefile        |    3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

--- a/configure
+++ b/configure
@@ -563,7 +563,7 @@
 PACKAGE_TARNAME='-llvm-'
 PACKAGE_VERSION='2.7'
 PACKAGE_STRING='llvm 2.7'
-PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu'
+PACKAGE_BUGREPORT='pkg-llvm-team@lists.alioth.debian.org'
 
 ac_unique_file="lib/VMCore/Module.cpp"
 # Factoring default headers for most tests.
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -14,4 +14,7 @@
 ## FIXME: This only requires RTTI because tblgen uses it.  Fix that.
 REQUIRES_RTTI = 1
 
+# -DLLVM_DEBIAN_INFO='" ($(OS) $(VERSION))"'
+CPP.Flags = $(DebianOpts)
+
 include $(LEVEL)/Makefile.common
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -1158,6 +1158,9 @@
 #ifdef LLVM_VERSION_INFO
     OS << LLVM_VERSION_INFO;
 #endif
+#ifdef LLVM_DEBIAN_INFO
+    OS << LLVM_DEBIAN_INFO;
+#endif
     OS << "\n  ";
 #ifndef __OPTIMIZE__
     OS << "DEBUG build";