diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 879f841808..7c815b6c3b 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -44,8 +44,11 @@ endif()
 
 #Clang doesn't support a few common flags that GCC does.
 if(NOT USE_CLANG)
-    # To support AVX1/AVX2 properly...
     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