diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index dec265b..bc02bcb 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,8 +1,8 @@
 DIST xen-3.1.0-src.tgz 6831094 RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 SHA1 fa4b54c36626f2cce9b15dc99cafda0b42c54777 SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7
-EBUILD xen-3.1.0.ebuild 2796 RMD160 0c2a45746d3cf025060b28f572eef421c32d78c0 SHA1 3f003a4e7171ab55ef04bbd1e52a02490bc0d869 SHA256 2fb8e663c340740fa3ecf596c96a501db501543c7e972417783bb3391f7cd0b2
-MD5 a798487075f8e32a77f6a4f3f1305219 xen-3.1.0.ebuild 2796
-RMD160 0c2a45746d3cf025060b28f572eef421c32d78c0 xen-3.1.0.ebuild 2796
-SHA256 2fb8e663c340740fa3ecf596c96a501db501543c7e972417783bb3391f7cd0b2 xen-3.1.0.ebuild 2796
+EBUILD xen-3.1.0.ebuild 2851 RMD160 68076fb842dac55d04d874888a540db359ae56d3 SHA1 a2588caa620bae61918bbd5d77e633bb42c71fbf SHA256 a0cb89bcba3fc9849b1c1531cfe1f4aed58c9fda86480e4942dcd722a776eb10
+MD5 964f62c75129349b38d2d726957c0998 xen-3.1.0.ebuild 2851
+RMD160 68076fb842dac55d04d874888a540db359ae56d3 xen-3.1.0.ebuild 2851
+SHA256 a0cb89bcba3fc9849b1c1531cfe1f4aed58c9fda86480e4942dcd722a776eb10 xen-3.1.0.ebuild 2851
 MD5 b2e86effae6681cbbecdbf864b193b4a files/digest-xen-3.1.0 235
 RMD160 2366b7298f0125f11d41aca0c6088c20863dbed1 files/digest-xen-3.1.0 235
 SHA256 12c130912c624791e6855ebeb932368fc8889371876db396055b02ac9a3b9892 files/digest-xen-3.1.0 235
diff --git a/app-emulation/xen/xen-3.1.0.ebuild b/app-emulation/xen/xen-3.1.0.ebuild
index 93aab2d..3d4217f 100644
--- a/app-emulation/xen/xen-3.1.0.ebuild
+++ b/app-emulation/xen/xen-3.1.0.ebuild
@@ -17,7 +17,7 @@ IUSE="debug custom-cflags pae"
 
 RDEPEND="|| ( sys-boot/grub
 		sys-boot/grub-static )
-		>=sys-kernel/xen-sources-2.6.16.33"
+		>=sys-kernel/xen-sources-2.6.18"
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
 RESTRICT="test"
@@ -54,11 +54,18 @@ src_unpack() {
 
 	# xen tries to be smart and filter out CFLAGs not supported by gcc.
 	# It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does.
-	for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do
-		test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
+	for FLAG in -nopie -fno-stack-protector-all -fno-stack-protector
+	do
+		if test-flag-CC ${FLAG} 
+		then
+		einfo "Filtering flag:  " ${FLAG}
+			for FILE in $(grep -H -r \\${FLAG} ${S}/xen/ | cut -d':' -f1)
+			do
+				sed  -i "/${FLAG}\,/d" ${FILE}
+			done
+		fi
 	done
-	sed  -i "s/^CFLAGS-y.*__XEN__.*$/& ${HARDFLAGS}/" \
-		"${S}"/xen/Rules.mk
+
 }
 
 src_compile() {
@@ -81,7 +88,7 @@ src_install() {
 	use debug && myopt="${myopt} debug=y"
 	use pae && myopt="${myopt} pae=y"
 
-	make DESTDIR="${D}" ${myopt} install-xen || die "install failed"
+	emake DESTDIR="${D}" ${myopt} install-xen || die "install failed"
 }
 
 pkg_postinst() {
@@ -96,3 +103,4 @@ pkg_postinst() {
 		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
 	fi
 }
+