diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ee8221..cfba97e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ target_include_directories(xxHash PRIVATE
 
 link_directories(${LLVM_LIBRARY_DIRS})
 
-find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-3.9 llvm-config PATHS ${LLVM_CONFIG} DOC "llvm-config")
+find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config PATHS ${LLVM_CONFIG} DOC "llvm-config")
 find_program(MAKE make)
 
 if (LLVM_CONFIG_EXECUTABLE STREQUAL "LLVM_CONFIG_EXECUTABLE-NOTFOUND")
@@ -54,8 +54,6 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-string(REPLACE "-fvisibility-inlines-hidden" "" LLVM_CXXFLAGS "${LLVM_CXXFLAGS}")
-
 execute_process(
   COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs
   OUTPUT_VARIABLE LLVM_LIBS
@@ -104,6 +102,10 @@ set_target_properties(InstrumentMonitors InstantiateHarness GenerateSeeds
   PROPERTIES COMPILE_FLAGS "-fno-rtti"
 )
 
+set_target_properties(InstrumentMonitors
+  PROPERTIES LINK_FLAGS "-Wl,-znodelete"
+)
+
 # Get proper shared-library behavior (where symbols are not necessarily
 # resolved when the shared library is linked) on OS X.
 if(APPLE)
diff --git a/README.md b/README.md
index 757b7c7..5b17242 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ The fuzzer for constant time.
 ## Requirements
 
 * The [Python] platform, version 2.7
-* The [LLVM] compiler infrastructure, version 3.9
+* The [LLVM] compiler infrastructure, version >= 5.0
 * The [jemalloc] memory allocator
 
 ## Installation
diff --git a/afl b/afl
index 9c6f7f0..6931ccb 160000
--- a/afl
+++ b/afl
@@ -1 +1 @@
-Subproject commit 9c6f7f0ac5e05491848b0a84e6b94edb0bf3a947
+Subproject commit 6931ccb3f66c7328e73de40f230d4dc20b61dcc4