diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfde1db55d0e31d50df3884310d22c4bf368dbd8..a72356b68e591f1dfa14861190ca4f80686f0495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,5 @@
 find_package(LLVM REQUIRED CONFIG)
 
-list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
-
-# Workarounds.
-# http://lists.cs.uiuc.edu/pipermail/llvmdev/2015-January/081050.html
-set(LLVM_ENABLE_PLUGINS ON)
-set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib)
-set(LLVM_PLUGIN_EXT ".so")
-
-include(AddLLVM)
-
 add_definitions(${LLVM_DEFINITIONS})
 include_directories(${LLVM_INCLUDE_DIRS})
 link_directories(${LLVM_LIBRARY_DIRS})
diff --git a/skeleton/CMakeLists.txt b/skeleton/CMakeLists.txt
index a2feb14eca91e6b246f65f7707cc2c124cd0c6de..e3518045132a78d4507e42f91dcecbfbb45e4947 100644
--- a/skeleton/CMakeLists.txt
+++ b/skeleton/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_loadable_module(SkeletonPass
+add_library(SkeletonPass MODULE
     # List your source files here.
     Skeleton.cpp
 )