diff --git a/conf/intel/portage/env/O3.amd64.conf b/conf/intel/portage/env/O3.amd64.conf
new file mode 100644
index 0000000..fae6b3b
--- /dev/null
+++ b/conf/intel/portage/env/O3.amd64.conf
@@ -0,0 +1,3 @@
+# Set -O3 for perf. critical packages
+CFLAGS="-O3 -march=x86-64 -pipe"
+CXXFLAGS="${CFLAGS}"
diff --git a/conf/intel/portage/env/O3.conf b/conf/intel/portage/env/O3.x86.conf
similarity index 65%
rename from conf/intel/portage/env/O3.conf
rename to conf/intel/portage/env/O3.x86.conf
index d0b2570..2cb87eb 100644
--- a/conf/intel/portage/env/O3.conf
+++ b/conf/intel/portage/env/O3.x86.conf
@@ -1,3 +1,3 @@
 # Set -O3 for perf. critical packages
-CFLAGS="-O3 -pipe"
+CFLAGS="-O3 -march=i686 -pipe"
 CXXFLAGS="${CFLAGS}"
diff --git a/conf/intel/portage/package.env b/conf/intel/portage/package.env
deleted file mode 100644
index de6d5aa..0000000
--- a/conf/intel/portage/package.env
+++ /dev/null
@@ -1,3 +0,0 @@
-www-servers/apache apache.conf
-media-video/ffmpeg O3.conf
-media-video/libav O3.conf
diff --git a/conf/intel/portage/package.env.amd64 b/conf/intel/portage/package.env.amd64
new file mode 100644
index 0000000..d55f6cb
--- /dev/null
+++ b/conf/intel/portage/package.env.amd64
@@ -0,0 +1,3 @@
+www-servers/apache apache.conf
+media-video/ffmpeg O3.amd64.conf
+media-video/libav O3.amd64.conf
diff --git a/conf/intel/portage/package.env.x86 b/conf/intel/portage/package.env.x86
new file mode 100644
index 0000000..a0dd638
--- /dev/null
+++ b/conf/intel/portage/package.env.x86
@@ -0,0 +1,3 @@
+www-servers/apache apache.conf
+media-video/ffmpeg O3.x86.conf
+media-video/libav O3.x86.conf