diff --git a/Source/Core/VideoBackends/OGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp
index 6dd86866fd..4d9980fc65 100644
--- a/Source/Core/VideoBackends/OGL/Src/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/Render.cpp
@@ -476,7 +476,8 @@ Renderer::Renderer()
 	g_ogl_config.bSupportsGLSLCache = TO_BOOL(GLEW_ARB_get_program_binary);
 	g_ogl_config.bSupportsGLPinnedMemory = TO_BOOL(GLEW_AMD_pinned_memory);
 	g_ogl_config.bSupportsGLSync = TO_BOOL(GLEW_ARB_sync);
-	g_ogl_config.bSupportsGLBaseVertex = TO_BOOL(GLEW_ARB_draw_elements_base_vertex);
+	g_ogl_config.bSupportsGLBaseVertex = TO_BOOL(GLEW_ARB_draw_elements_base_vertex) &&
+						!DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY);
 	g_ogl_config.bSupportCoverageMSAA = TO_BOOL(GLEW_NV_framebuffer_multisample_coverage);
 	g_ogl_config.bSupportSampleShading = TO_BOOL(GLEW_ARB_sample_shading);
 	g_ogl_config.bSupportOGL31 = TO_BOOL(GLEW_VERSION_3_1);
diff --git a/Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp
index f6630c0d09..8ec9c3c1cb 100644
--- a/Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp
@@ -40,7 +40,7 @@ StreamBuffer::StreamBuffer(u32 type, size_t size, StreamType uploadType)
 			m_uploadtype = BUFFERDATA;
 		else if(g_ogl_config.bSupportsGLSync && g_ActiveConfig.bHackedBufferUpload && (m_uploadtype & MAP_AND_RISK))
 			m_uploadtype = MAP_AND_RISK;
-		else if(g_ogl_config.bSupportsGLSync && g_ogl_config.bSupportsGLPinnedMemory && !(DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY) && type == GL_ELEMENT_ARRAY_BUFFER) && (m_uploadtype & PINNED_MEMORY))
+		else if(g_ogl_config.bSupportsGLSync && g_ogl_config.bSupportsGLPinnedMemory && (m_uploadtype & PINNED_MEMORY))
 			m_uploadtype = PINNED_MEMORY;
 		else if(nvidia && (m_uploadtype & BUFFERSUBDATA))
 			m_uploadtype = BUFFERSUBDATA;
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
index 5e92d1e587..abb27e082e 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -38,18 +38,19 @@ namespace DriverDetails
 	// This is a list of all known bugs for each vendor
 	// We use this to check if the device and driver has a issue
 	BugInfo m_known_bugs[] = {
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_NODYNUBOACCESS,      14.0, 46.0, true},
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENCENTROID,      14.0, 46.0, true},
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENINFOLOG,       -1.0, 46.0, true},
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_ANNIHILATEDUBOS,     41.0, 46.0, true},
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENSWAP,          -1.0, 46.0, true},
-		{OS_ALL, VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
-		{OS_ALL, VENDOR_ARM,      DRIVER_ARM_T6XX,     BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
-		{OS_ALL, VENDOR_MESA,     DRIVER_NOUVEAU,      BUG_BROKENUBO,           900,  916, true},
-		{OS_ALL, VENDOR_MESA,     DRIVER_R600,         BUG_BROKENUBO,           900,  913, true},
-		{OS_ALL, VENDOR_MESA,     DRIVER_I965,         BUG_BROKENUBO,           900,  920, true},
-		{OS_ALL, VENDOR_ATI,      DRIVER_ATI,          BUG_BROKENHACKEDBUFFER,  -1.0, -1.0, true},
-		{OS_ALL, VENDOR_MESA,     DRIVER_NOUVEAU,      BUG_BROKENHACKEDBUFFER,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_NODYNUBOACCESS,      14.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENCENTROID,      14.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENINFOLOG,       -1.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_ANNIHILATEDUBOS,     41.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENSWAP,          -1.0, 46.0, true},
+		{OS_ALL,    VENDOR_QUALCOMM, DRIVER_QUALCOMM_3XX, BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_ARM,      DRIVER_ARM_T6XX,     BUG_BROKENBUFFERSTREAM,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_NOUVEAU,      BUG_BROKENUBO,           900,  916, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_R600,         BUG_BROKENUBO,           900,  913, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_I965,         BUG_BROKENUBO,           900,  920, true},
+		{OS_ALL,    VENDOR_ATI,      DRIVER_ATI,          BUG_BROKENHACKEDBUFFER,  -1.0, -1.0, true},
+		{OS_LINUX,  VENDOR_ATI,      DRIVER_ATI,          BUG_BROKENPINNEDMEMORY,  -1.0, -1.0, true},
+		{OS_ALL,    VENDOR_MESA,     DRIVER_NOUVEAU,      BUG_BROKENHACKEDBUFFER,  -1.0, -1.0, true},
 	};
 
 	std::map<Bug, BugInfo> m_bugs;
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
index 6ce3afbae5..8c88234e5a 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -104,8 +104,10 @@ namespace DriverDetails
 		// Affected devices: AMD as they are the only vendor providing this extension
 		// Started Version: ?
 		// Ended Version: 13.9 working for me (neobrain).
+		// Affected OS: Linux
 		// Pinned memory is disabled for index buffer as the amd driver (the only one with pinned memory support) seems
 		// to be broken. We just get flickering/black rendering when using pinned memory here -- degasus - 2013/08/20
+		// This bug only happens when paired with base_vertex.
 		// Please see issue #6105 on google code. Let's hope buffer storage solves this issues.
 		// TODO: Detect broken drivers.
 		BUG_BROKENPINNEDMEMORY,