diff --git eclass/kernel-2.eclass eclass/kernel-2.eclass
index 5a9ea9f..91f9f8d 100644
--- eclass/kernel-2.eclass
+++ eclass/kernel-2.eclass
@@ -642,7 +642,8 @@ compile_headers() {
 
 	# if we couldnt obtain HOSTCFLAGS from the Makefile,
 	# then set it to something sane
-	local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile)
+	# local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile)
+	local HOSTCFLAGS=""
 	HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer}
 
 	if kernel_is 2 4; then
@@ -716,6 +717,7 @@ install_universal() {
 install_headers() {
 	local ddir=$(kernel_header_destdir)
 
+	[[ ${ETYPE} == headers ]] && unset KBUILD_OUTPUT
 	# 2.6.18 introduces headers_install which means we dont need any
 	# of this crap anymore :D
 	if kernel_is ge 2 6 18 ; then