diff --git a/paludis/bashrc b/paludis/bashrc
index 492edba..7b283c1 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -33,17 +33,7 @@ GAMES_GROUP=users
 ## per-package settings
 
 # laptop-compat, keep this at the top
-if [[
-	"${CATEGORY}/${PN}" == "app-emulation/wine" ||
-	"${CATEGORY}/${PN}" == "app-office/libreoffice" ||
-	"${CATEGORY}/${PN}" == "dev-qt/qtwebkit" ||
-	"${CATEGORY}/${PN}" == "mail-client/thunderbird" ||
-	"${CATEGORY}/${PN}" == "net-libs/webkit-gtk" ||
-	"${CATEGORY}/${PN}" == "sys-devel/llvm" ||
-	"${CATEGORY}/${PN}" == "www-client/firefox" ||
-	"${CATEGORY}/${PN}" == "www-client/torbrowser" ||
-	"${CATEGORY}/${PN}" == "x11-libs/wxGTK"
-	]]
+if [[ "${MERGE_TYPE}" == "buildonly" ]]
 then
 	CFLAGS="-march=core-avx-i -O2 -pipe"
 	CXXFLAGS="-march=core-avx-i -O2 -pipe"
@@ -56,8 +46,7 @@ if [[
 	"${CATEGORY}/${PN}" != "games-engines/OpenJK"
 	]]
 then
-	CFLAGS="${CFLAGS} -O3"
-	CXXFLAGS="${CXXFLAGS} -O3"
+	. /etc/paludis/env.conf.d/O3.conf
 fi
 
 [[ -e /etc/paludis/hooks/setup_pkg_env.bash ]] && . /etc/paludis/hooks/setup_pkg_env.bash
diff --git a/paludis/env.conf.d/O3.conf b/paludis/env.conf.d/O3.conf
new file mode 100644
index 0000000..a329caa
--- /dev/null
+++ b/paludis/env.conf.d/O3.conf
@@ -0,0 +1,2 @@
+add-options CFLAGS -O3
+add-options CXXFLAGS -O3