--- x11-libs/qt/qt-3.3.8-r4.ebuild
+++ x11-libs/qt/qt-3.3.8-r4.ebuild
@@ -156,8 +156,8 @@
 		append-flags -fno-stack-protector
 	fi
 
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
 		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
@@ -169,6 +169,10 @@
 		sed -i -e "s:/lib$:/$(get_libdir):" \
 			${S}/mkspecs/${PLATFORM}/qmake.conf || die
 	fi
+
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
+		   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		${S}/qmake/Makefile.unix
 }
 
 src_compile() {
--- x11-libs/qt/qt-4.3.3.ebuild
+++ x11-libs/qt/qt-4.3.3.ebuild
@@ -132,8 +132,8 @@
 		append-flags -fno-stack-protector
 	fi
 
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		-e "/CONFIG/s:$: nostrip:" \
 		qmake.conf
--- x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
+++ x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
@@ -33,6 +33,10 @@
 
 src_unpack() {
 	qt4-build_src_unpack
+
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix failed"
 }
 
 src_compile() {
--- eclass/qt4-build.eclass
+++ eclass/qt4-build.eclass
@@ -50,6 +50,20 @@
 		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
 		append-flags -fno-stack-protector
 	fi
+
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		-e "s:X11R6/::" \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
+
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
+		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		mkspecs/common/g++.conf || die "sed mkspecs/common/g++.conf failed"
+
+	sed -i -e "s:X11R6/::" \
+		mkspecs/common/linux.conf || die "sed mkspecs/common/linux.conf failed"
 }
 
 qt4-build_src_install() {