diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 17d1b1c40e..41f1222c11 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -15,6 +15,8 @@ endif()
 set(CommonFlags
     # GCC-4.6 crash pcsx2 during the binding of plugins at startup...
     # Disable this optimization for the moment
+    # GCC-4.9 update:
+    # Crash when you start a game. Likely a stack corruption/alignment
     -fno-omit-frame-pointer
     # END GCC-4.6
     -fno-strict-aliasing
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index e15b7c8dfd..a7f0f07482 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -51,10 +51,6 @@ endif()
 #Clang doesn't support a few common flags that GCC does.
 if(NOT USE_CLANG)
     set(GSdxFinalFlags ${GSdxFinalFlags} -fabi-version=6)
-    if (_M_X86_32 AND NOT USE_ASAN)
-        # Someone need to seriously test the build of GSdx without this option
-        set(GSdxFinalFlags ${GSdxFinalFlags} -mpreferred-stack-boundary=2)
-    endif()
 endif()
 
 set(GSdxSources