diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59fb4d80dc..89bc070fc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 3.0.2)
 
-option(WITH_GDB "Build RPCS3 with GNU GDB debugger support." OFF)
-option(WITHOUT_LLVM "Build RPCS3 without LLVM (not recommended)." OFF)
-option(USE_SHARED_LLVM_LIBS "Link against shared LLVM libs, instead of statically.
-Only recommended on Gentoo. May interfere with mesa driver and make RPCS3 non-functional." OFF)
+option(WITH_GDB "WITH_GDB" OFF)
+option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
 
 if (WITH_GDB)
 	add_definitions(-DWITH_GDB_DEBUGGER)
diff --git a/README.md b/README.md
index 357f6e5723..e95be45ff8 100644
--- a/README.md
+++ b/README.md
@@ -82,9 +82,6 @@ Build against the shared libpng instead of using the builtin one. libpng 1.6+ hi
 - ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*)  
 Build against the shared ffmpeg libraries instead of using the builtin patched version. Try this if the builtin version breaks the OpenGL renderer for you.
 
-- ```-DUSE_SHARED_LLVM_LIBS=ON/OFF``` (default = *OFF*)  
-This builds against the shared LLVM libs, rather than the static ones. This may interfere with Mesa and render RPCS3 non-functional. Only recommended on gentoo.
-
 - ```-DWITHOUT_LLVM=ON/OFF``` (default = *OFF*)  
 This forces RPCS3 to build without LLVM, not recommended.
 
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 580b80f698..57f884f17a 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -272,17 +272,10 @@ if(NOT LLVM_FOUND)
 else()
 	add_definitions(${LLVM_DEFINITIONS})
 	add_definitions(-DLLVM_AVAILABLE)
-	
-	# Gentoo doesn't provide static LLVM libraries, so we need an option to use the shared ones.
-	if (USE_SHARED_LLVM_LIBS)
-		Message("WARNING! Linking against shared LLVM libs may conflict with your system's mesa, rendering RPCS3 non-functional!")
-		set(LLVM_LIBS LLVM)
+	if (CMAKE_BUILD_TYPE STREQUAL "Release")
+		llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler)
 	else()
-		if (CMAKE_BUILD_TYPE STREQUAL "Release")
-			llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler)
-		else()
-			llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
-		endif()
+		llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
 	endif()
 
 	if (NOT MSVC)