diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h
index 6611dc24b9..65b5c50fb6 100644
--- a/common/include/PS2Edefs.h
+++ b/common/include/PS2Edefs.h
@@ -592,7 +592,6 @@ typedef void(CALLBACK *_GSprintf)(int timeout, char *fmt, ...);
 typedef void(CALLBACK *_GSsetBaseMem)(void *);
 typedef void(CALLBACK *_GSsetGameCRC)(int, int);
 typedef void(CALLBACK *_GSsetFrameSkip)(int frameskip);
-typedef void(CALLBACK *_GSsetFrameLimit)(int limit);
 typedef void(CALLBACK *_GSsetVsync)(int enabled);
 typedef void(CALLBACK *_GSsetExclusive)(int isExclusive);
 typedef int(CALLBACK *_GSsetupRecording)(int, void *);
@@ -755,7 +754,6 @@ extern _GSprintf GSprintf;
 extern _GSsetBaseMem GSsetBaseMem;
 extern _GSsetGameCRC GSsetGameCRC;
 extern _GSsetFrameSkip GSsetFrameSkip;
-extern _GSsetFrameLimit GSsetFrameLimit;
 extern _GSsetVsync GSsetVsync;
 extern _GSsetupRecording GSsetupRecording;
 extern _GSreset GSreset;
diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
index 84de5e60b8..22008ae139 100644
--- a/plugins/GSdx/GS.cpp
+++ b/plugins/GSdx/GS.cpp
@@ -63,7 +63,6 @@ extern bool RunLinuxDialog();
 static GSRenderer* s_gs = NULL;
 static void (*s_irq)() = NULL;
 static uint8* s_basemem = NULL;
-static bool s_framelimit = true;
 static bool s_vsync = false;
 static bool s_exclusive = true;
 static const char *s_renderer_name = "";
@@ -449,7 +448,6 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t
 	s_gs->SetRegsMem(s_basemem);
 	s_gs->SetIrqCallback(s_irq);
 	s_gs->SetVSync(s_vsync);
-	s_gs->SetFrameLimit(s_framelimit);
 
 	if(!old_api)
 		s_gs->SetMultithreaded(true);
@@ -987,16 +985,6 @@ EXPORT_C GSsetExclusive(int enabled)
 	}
 }
 
-EXPORT_C GSsetFrameLimit(int limit)
-{
-	s_framelimit = !!limit;
-
-	if(s_gs)
-	{
-		s_gs->SetFrameLimit(s_framelimit);
-	}
-}
-
 #ifdef _WIN32
 
 #include <io.h>
diff --git a/plugins/GSdx/GSRenderer.cpp b/plugins/GSdx/GSRenderer.cpp
index c802efec5f..1ccad3a2b6 100644
--- a/plugins/GSdx/GSRenderer.cpp
+++ b/plugins/GSdx/GSRenderer.cpp
@@ -34,7 +34,6 @@ GSRenderer::GSRenderer()
 	: m_shader(0)
 	, m_shift_key(false)
 	, m_control_key(false)
-	, m_framelimit(false)
 	, m_texture_shuffle(false)
 	, m_real_size(0,0)
 	, m_wnd()
@@ -73,7 +72,7 @@ bool GSRenderer::CreateDevice(GSDevice* dev)
 	}
 
 	m_dev = dev;
-	m_dev->SetVSync(m_vsync && m_framelimit);
+	m_dev->SetVSync(m_vsync);
 
 	return true;
 }
@@ -305,13 +304,6 @@ GSVector2i GSRenderer::GetInternalResolution()
 	return m_real_size;
 }
 
-void GSRenderer::SetFrameLimit(bool limit)
-{
-	m_framelimit = limit;
-
-	if(m_dev) m_dev->SetVSync(m_vsync && m_framelimit);
-}
-
 void GSRenderer::SetVSync(bool enabled)
 {
 	m_vsync = enabled;
diff --git a/plugins/GSdx/GSRenderer.h b/plugins/GSdx/GSRenderer.h
index ac249fd03e..082f20ad9f 100644
--- a/plugins/GSdx/GSRenderer.h
+++ b/plugins/GSdx/GSRenderer.h
@@ -42,7 +42,6 @@ protected:
 	int m_aspectratio;
 	bool m_vsync;
 	bool m_aa1;
-	bool m_framelimit;
 	bool m_shaderfx;
 	bool m_fxaa;
 	bool m_shadeboost;
@@ -71,7 +70,6 @@ public:
 	GSVector2i GetInternalResolution();
 	void SetAspectRatio(int aspect) {m_aspectratio = aspect;}
 	void SetVSync(bool enabled);
-	void SetFrameLimit(bool limit);
 	virtual void SetExclusive(bool isExcl) {}
 
 	virtual bool BeginCapture();
diff --git a/plugins/GSdx/GSState.h b/plugins/GSdx/GSState.h
index d48cc391a2..93387f6570 100644
--- a/plugins/GSdx/GSState.h
+++ b/plugins/GSdx/GSState.h
@@ -221,7 +221,6 @@ public:
 	std::unique_ptr<GSDumpBase> m_dump;
 	int m_options;
 	int m_frameskip;
-	bool m_framelimit;
 	bool m_NTSC_Saturation;
 	bool m_nativeres;
 	int m_mipmap;
diff --git a/plugins/GSdx/GSdx.def b/plugins/GSdx/GSdx.def
index 2f7d6e5dba..152e77a7a8 100644
--- a/plugins/GSdx/GSdx.def
+++ b/plugins/GSdx/GSdx.def
@@ -36,7 +36,6 @@ EXPORTS
 	GSsetupRecording		
 	GSsetGameCRC		
 	GSsetFrameSkip
-	GSsetFrameLimit		
 	GSsetVsync
 	GSsetExclusive
 	GSsetSettingsDir