diff --git a/plugins/GSdx/GSRenderer.cpp b/plugins/GSdx/GSRenderer.cpp
index 6b307f2864..73d8393587 100644
--- a/plugins/GSdx/GSRenderer.cpp
+++ b/plugins/GSdx/GSRenderer.cpp
@@ -37,7 +37,7 @@ GSRenderer::GSRenderer()
 	
 	m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", 1);
 	if(m_nativeres) m_upscale_multiplier = 1;
-	else if (m_upscale_multiplier > 4) m_upscale_multiplier = 1;
+	else if (m_upscale_multiplier > 6) m_upscale_multiplier = 1;
 
 	m_aa1 = !!theApp.GetConfig("aa1", 0);
 
diff --git a/plugins/GSdx/GSRendererHW.h b/plugins/GSdx/GSRendererHW.h
index 0c178d7626..4726aa5066 100644
--- a/plugins/GSdx/GSRendererHW.h
+++ b/plugins/GSdx/GSRendererHW.h
@@ -721,7 +721,7 @@ public:
 			m_width = theApp.GetConfig("resx", m_width);
 			m_height = theApp.GetConfig("resy", m_height);
 			m_upscale_multiplier = theApp.GetConfig("upscale_multiplier", m_upscale_multiplier);
-			if (m_upscale_multiplier > 4) m_upscale_multiplier = 1; //use the normal upscale math
+			if (m_upscale_multiplier > 6) m_upscale_multiplier = 1; //use the normal upscale math
 			if (m_upscale_multiplier > 1) 
 			{
 				m_width  = 640 * m_upscale_multiplier; //512 is also common, but this is not always detected right.
diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp
index 0ef497f4e3..bd123094da 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/GSSettingsDlg.cpp
@@ -69,6 +69,8 @@ GSSetting GSSettingsDlg::g_upscale_multiplier[] =
 	{2, "2x", NULL},
 	{3, "3x", NULL},
 	{4, "4x", NULL},
+	{5, "5x", NULL},
+	{6, "6x", NULL},
 };
 
 GSSettingsDlg::GSSettingsDlg( bool isOpen2 )