diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp
index 36c2bef..b86b787 100644
--- a/conf/armv7l/portage/make.conf.hardfp
+++ b/conf/armv7l/portage/make.conf.hardfp
@@ -1,8 +1,8 @@
 # Temp disable Graphite due to known x11-libs/qt bugs
-# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
 FPUABI="-mfloat-abi=hard"
 
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}"
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 CHOST="armv7a-hardfloat-linux-gnueabi"
diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp
index 80d36be..67490d8 100644
--- a/conf/armv7l/portage/make.conf.softfp
+++ b/conf/armv7l/portage/make.conf.softfp
@@ -1,8 +1,8 @@
 # Temp disable Graphite due to known x11-libs/qt-* bugs
-# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
 FPUABI="-mfloat-abi=softfp"
 
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}"
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI}"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 CHOST="armv7a-unknown-linux-gnueabi"
diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index d4890c0..f376c74 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -2,8 +2,8 @@
 # Please consult /etc/make.conf.example for a more detailed example
 
 # Compiler stuff
-# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# Only enable Graphite via package.env
 CFLAGS="-O2 -march=x86-64 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="x86_64-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
index b29cb87..32db82d 100644
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -2,8 +2,8 @@
 # Please consult /etc/make.conf.example for a more detailed example
 
 # Compiler stuff
-# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities
+GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
+# Only enable Graphite via package.env
 CFLAGS="-O2 -march=i686 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="i686-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"