diff --git a/plugins/GSdx/GSUtil.cpp b/plugins/GSdx/GSUtil.cpp
index d6123e319d..69aba2fba9 100644
--- a/plugins/GSdx/GSUtil.cpp
+++ b/plugins/GSdx/GSUtil.cpp
@@ -62,7 +62,9 @@ const char* GSUtil::GetLibName()
 		sl.push_back(format("GCC %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
 		#endif
 
-		#if _M_SSE >= 0x500
+		#if _M_SSE >= 0x501
+		sl.push_back("AVX2");
+		#elif _M_SSE >= 0x500
 		sl.push_back("AVX");
 		#elif _M_SSE >= 0x402
 		sl.push_back("SSE42");
diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj
index 6da0cb013c..babb34c27b 100644
--- a/plugins/GSdx/GSdx.vcxproj
+++ b/plugins/GSdx/GSdx.vcxproj
@@ -160,7 +160,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs10.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\release.props" />
     <Import Project="vsprops\x86.props" />
@@ -176,7 +176,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs10.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\debug.props" />
     <Import Project="vsprops\x86.props" />
@@ -224,7 +224,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs10.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\release.props" />
     <Import Project="vsprops\x64.props" />
@@ -240,7 +240,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs10.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\debug.props" />
     <Import Project="vsprops\x64.props" />
diff --git a/plugins/GSdx/GSdx_vs11.vcxproj b/plugins/GSdx/GSdx_vs11.vcxproj
index dbf610f2c0..ffb8784255 100644
--- a/plugins/GSdx/GSdx_vs11.vcxproj
+++ b/plugins/GSdx/GSdx_vs11.vcxproj
@@ -214,7 +214,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs11.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\release.props" />
     <Import Project="vsprops\x86.props" />
@@ -238,7 +238,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs11.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\debug.props" />
     <Import Project="vsprops\x86.props" />
@@ -294,7 +294,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release AVX|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs11.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\release.props" />
     <Import Project="vsprops\x64.props" />
@@ -318,7 +318,7 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug AVX|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vsprops\ProjectRootDir.props" />
-    <Import Project="vsprops\avx.props" />
+    <Import Project="vsprops\avx_vs11.props" />
     <Import Project="vsprops\common.props" />
     <Import Project="vsprops\debug.props" />
     <Import Project="vsprops\x64.props" />
diff --git a/plugins/GSdx/vsprops/avx2.props b/plugins/GSdx/vsprops/avx2.props
index 342494e98f..e645e51e3a 100644
--- a/plugins/GSdx/vsprops/avx2.props
+++ b/plugins/GSdx/vsprops/avx2.props
@@ -9,7 +9,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_M_SSE=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/plugins/GSdx/vsprops/avx_vs10.props b/plugins/GSdx/vsprops/avx_vs10.props
new file mode 100644
index 0000000000..876419d57e
--- /dev/null
+++ b/plugins/GSdx/vsprops/avx_vs10.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <SSEtype>AVX</SSEtype>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="SSEtype">
+      <Value>$(SSEtype)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/plugins/GSdx/vsprops/avx.props b/plugins/GSdx/vsprops/avx_vs11.props
similarity index 89%
rename from plugins/GSdx/vsprops/avx.props
rename to plugins/GSdx/vsprops/avx_vs11.props
index a5c03035f9..e83c7fb32d 100644
--- a/plugins/GSdx/vsprops/avx.props
+++ b/plugins/GSdx/vsprops/avx_vs11.props
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <SSEtype>AVX</SSEtype>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/arch:AVX %(AdditionalOptions)</AdditionalOptions>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="SSEtype">
-      <Value>$(SSEtype)</Value>
-    </BuildMacro>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <SSEtype>AVX</SSEtype>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_M_SSE=0x500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="SSEtype">
+      <Value>$(SSEtype)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
\ No newline at end of file