diff --git a/plugins/GSdx/GSSetting.cpp b/plugins/GSdx/GSSetting.cpp
index c3d58223e5..b0546df6d3 100644
--- a/plugins/GSdx/GSSetting.cpp
+++ b/plugins/GSdx/GSSetting.cpp
@@ -30,21 +30,23 @@ const char* dialog_message(int ID, bool* updateText) {
 		*updateText = true;
 	switch (ID)
 	{
-#ifdef __linux__
 		case IDC_CRC_LEVEL:
-			return "Control the number of Auto-CRC hacks applyed to the game.\n\n"
-				"None       : Remove nearly all CRC hacks (debug only).\n\n"
-				"Minimum    : Enable a couple of CRC hacks (23).\n\n"
-				"Partial    : Enable most of the CRC hacks. It is the recommended setting for OpenGL users."
-				"Note, it might require accurate options.\n\n"
-				"Full       : Enable all CRC hacks. It is recommended setting for Dx users.\n\n"
-				"Aggressive : Use more aggressive CRC hacks on some games.\n"
-				"    Only affects few games, removing some effects which might make the image sharper/clearer.\n"
-				"    Affected games: FFX, FFX2, FFXII, GOW2, ICO, SoTC, SSX3, SMT3, SMTDDS1, SMTDDS2.\n"
-				"    Works as a speedhack for: Steambot Chronicles.";
-
-
-#endif
+			return "Control the number of Auto-CRC hacks applied to games.\n\n"
+				"None\t\t: Remove nearly all CRC hacks (debug only).\n"
+				"------------------------------------------------------------------\n"
+				"Minimum\t: Enable a couple of CRC hacks (23).\n"
+				"------------------------------------------------------------------\n"
+				"Partial\t\t: Enable most of the CRC hacks.\n\n"
+				"Recommended setting for OpenGL users.\n"
+				"Note, may require \'Accurate\' options to be enabled under Hardware Mode Settings.\n"
+				"------------------------------------------------------------------\n"
+				"Full\t\t: Enable all CRC hacks.\n\n" 
+				"Recommended setting for DirectX users.\n"
+				"------------------------------------------------------------------\n"
+				"Aggressive\t : Use more aggressive CRC hacks.\n\n"
+				"Only affects a few games, removing some effects which might make the image sharper/clearer.\n\n"
+				"Affected games: FFX, FFX2, FFXII, GOW2, ICO, SoTC, SSX3, SMT3, SMTDDS1, SMTDDS2.\n"
+				"Works as a speedhack for: Steambot Chronicles.";
 		case IDC_SKIPDRAWHACK:
 		case IDC_SKIPDRAWHACKEDIT:
 		case IDC_STATIC_SKIPDRAW:
diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp
index 70155d51df..9d101b15cb 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/GSSettingsDlg.cpp
@@ -603,6 +603,13 @@ void GSHacksDlg::OnInit()
 
 	SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_SETCURSEL, msaa2cb[min(theApp.GetConfig("UserHacks_MSAA", 0), 16)], 0);
 
+	char crctext[5][32] = { "None", "Minimal", "Partial", "Full", "Agressive" };
+	for (unsigned short i = 0; i < 5; i++){
+		SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_ADDSTRING, 0, (LPARAM)crctext[i]);
+	}
+	
+	SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_SETCURSEL, theApp.GetConfig("crc_hack_level", 3), 0);
+
 	CheckDlgButton(m_hWnd, IDC_ALPHAHACK, theApp.GetConfig("UserHacks_AlphaHack", 0));
 	CheckDlgButton(m_hWnd, IDC_OFFSETHACK, theApp.GetConfig("UserHacks_HalfPixelOffset", 0));
 	CheckDlgButton(m_hWnd, IDC_SPRITEHACK, theApp.GetConfig("UserHacks_SpriteHack", 0));
@@ -662,6 +669,7 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
 		case IDOK: 
 		{
 			theApp.SetConfig("UserHacks_MSAA", cb2msaa[(int)SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_GETCURSEL, 0, 0)]);
+			theApp.SetConfig("crc_hack_level", (int)SendMessage(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), CB_GETCURSEL, 0, 0));
 			theApp.SetConfig("UserHacks_AlphaHack", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHAHACK));
 			theApp.SetConfig("UserHacks_HalfPixelOffset", (int)IsDlgButtonChecked(m_hWnd, IDC_OFFSETHACK));
 			theApp.SetConfig("UserHacks_SpriteHack", (int)IsDlgButtonChecked(m_hWnd, IDC_SPRITEHACK));
diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc
index 203a6c03f1..c504169f32 100644
--- a/plugins/GSdx/GSdx.rc
+++ b/plugins/GSdx/GSdx.rc
@@ -89,37 +89,37 @@ IDB_LOGOGL              BITMAP                  "res\\logo-ogl.bmp"
 // Dialog
 //
 
-IDD_HACKS DIALOGEX 0, 0, 315, 294 
+IDD_HACKS DIALOGEX 0, 0, 315, 294
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hacks Configuration"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,258,273,50,14   
-    GROUPBOX        "Hack",IDC_STATIC,7,7,86,262,0,WS_EX_TRANSPARENT  
-    GROUPBOX        "Description",IDC_STATIC,96,7,212,262  
+    DEFPUSHBUTTON   "OK",IDOK,258,273,50,14
+    GROUPBOX        "Hack",IDC_STATIC,7,7,86,262,0,WS_EX_TRANSPARENT
+    GROUPBOX        "Description",IDC_STATIC,96,7,212,262
     LTEXT           "MSAA",IDC_STATIC_MSAA,14,20,20,8
     LTEXT           "Skipdraw",IDC_STATIC_SKIPDRAW,14,37,30,8
     EDITTEXT        IDC_SKIPDRAWHACKEDIT,53,35,35,14,ES_RIGHT | ES_AUTOHSCROLL
     CONTROL         "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,88,35,10,14
-    CONTROL         "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,53,34,10
-    CONTROL         "Half-pixel Offset",IDC_OFFSETHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,69,65,10
-    CONTROL         "Sprite",IDC_SPRITEHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,85,35,10
-    LTEXT           "USE AT YOUR OWN RISK!",IDC_STATIC,7,276,84,11,WS_DISABLED   
+    CONTROL         "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,85,34,10
+    CONTROL         "Half-pixel Offset",IDC_OFFSETHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,101,65,10
+    CONTROL         "Sprite",IDC_SPRITEHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,117,35,10
+    LTEXT           "USE AT YOUR OWN RISK!",IDC_STATIC,7,276,84,11,WS_DISABLED
     COMBOBOX        IDC_MSAACB,35,18,54,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "WildArmsOffset",IDC_WILDHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,102,64,10
+    CONTROL         "WildArmsOffset",IDC_WILDHACK,"Button",BS_AUTO3STATE | WS_TABSTOP,14,134,64,10
     LTEXT           "TEXT_GOES_HERE",IDC_HACK_DESCRIPTION,102,20,199,192
-    CONTROL         "Aggressive-CRC",IDC_AGGRESSIVECRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,119,66,10
-    CONTROL         "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,136,66,10
-    CONTROL         "Disable CRCs",IDC_CHECK_DISABLE_ALL_HACKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,152,58,10
-    CONTROL         "Round Sprite",IDC_ROUND_SPRITE,"Button",BS_AUTO3STATE | WS_TABSTOP,14,168,66,10
-    CONTROL         "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,60,10
-    CONTROL         "Auto-skip depth",IDC_AUTO_SKIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,200,62,10
+    CONTROL         "Aggressive-CRC",IDC_AGGRESSIVECRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,151,66,10
+    CONTROL         "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,168,66,10
+    CONTROL         "Round Sprite",IDC_ROUND_SPRITE,"Button",BS_AUTO3STATE | WS_TABSTOP,14,186,66,8
+    CONTROL         "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,201,60,10
     LTEXT           "TC Offset X",IDC_STATIC_TCOFFSETX,14,234,37,8
     EDITTEXT        IDC_TCOFFSETX2,53,232,35,14,ES_RIGHT | ES_AUTOHSCROLL
     CONTROL         "",IDC_TCOFFSETX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,232,11,14
     EDITTEXT        IDC_TCOFFSETY2,53,249,35,14,ES_RIGHT | ES_AUTOHSCROLL
     CONTROL         "",IDC_TCOFFSETY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,86,249,11,14
     LTEXT           "TC Offset Y",IDC_STATIC_TCOFFSETY,14,251,37,8
+    COMBOBOX        IDC_CRC_LEVEL,13,65,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "CRC Hack Level",IDC_STATIC,14,54,51,8
 END
 
 IDD_SHADEBOOST DIALOGEX 0, 0, 316, 129
diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h
index 434bad61f2..9487bb9bee 100644
--- a/plugins/GSdx/resource.h
+++ b/plugins/GSdx/resource.h
@@ -62,6 +62,7 @@
 #define IDC_CHECK_DISABLE_ALL_HACKS     2077
 #define IDC_ALPHASTENCIL                2078
 #define IDC_ADAPTER                     2079
+#define IDC_CRC_LEVEL                   2079
 #define IDC_STATIC_TCOFFSETX            2080
 #define IDC_STATIC_TCOFFSETY            2081
 #define IDC_TCOFFSETX                   2082
@@ -78,7 +79,6 @@
 #define IDC_ACCURATE_COLCLIP            2094
 #define IDC_ROUND_SPRITE                2095
 #define IDC_ALIGN_SPRITE                2096
-#define IDC_AUTO_SKIP                   2097
 #define IDC_COLORSPACE                  3000
 #define IDR_CONVERT_FX                  10000
 #define IDR_TFX_FX                      10001
@@ -97,9 +97,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        10012
+#define _APS_NEXT_RESOURCE_VALUE        10013
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         2098
+#define _APS_NEXT_CONTROL_VALUE         2099
 #define _APS_NEXT_SYMED_VALUE           5000
 #endif
 #endif