diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index fd6b794b7..2cbb47671 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -94,7 +94,7 @@ class Gencontrol(Base):
         ):
             makeflags[i[1]] = data[i[0]]
         for i in (
-            ('cflags', 'CFLAGS'),
+            ('cflags', 'CFLAGS_KERNEL'),
             ('initramfs', 'INITRAMFS'),
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
diff --git a/debian/changelog b/debian/changelog
index 7986f8414..ea597c3d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-8) UNRELEASED; urgency=low
+
+  * Don't let default compiler flags escape into build.
+
+ -- Bastian Blank <waldi@debian.org>  Thu, 04 Feb 2010 12:08:47 +0100
+
 linux-2.6 (2.6.32-7) unstable; urgency=low
 
   [ maximilian attems]
diff --git a/debian/rules.real b/debian/rules.real
index c02d42a1f..3c014820b 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -111,8 +111,8 @@ else
 	echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
 	echo 'endif' >> '$(DIR)/.kernelvariables'
 endif
-ifdef CFLAGS
-	echo 'CFLAGS += $(CFLAGS)'  >> '$(DIR)/.kernelvariables'
+ifdef CFLAGS_KERNEL
+	echo 'CFLAGS += $(CFLAGS_KERNEL)'  >> '$(DIR)/.kernelvariables'
 endif
 	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' reportoldconfig
 	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' $(JOBS_ARG) prepare