diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ec9c838..ac7b3005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,9 @@ set(UML_HEADERS_DIR ${PROJECT_SOURCE_DIR}/src/uml)
 #
 # CMake build options
 #
-option(LLVM_CONFIG_PATH "Path to custom llvm-config executable")
 option(LINK_LLVM_SHARED "Should LLVM be linked using shared libraries or statically" ON)
-option(GIT_VERSION "clang-uml version" "0.1.0")
-
+set(LLVM_VERSION CACHE STRING "Path to custom llvm-config executable")
+set(GIT_VERSION "0.1.0" CACHE STRING "clang-uml version")
 
 #
 # Setup LLVM
@@ -37,7 +36,7 @@ if(LLVM_PREFIX)
     set(LLVM_CONFIG_BINARY ${LLVM_CONFIG_PATH})
 endif(LLVM_PREFIX)
 
-find_package(LLVM CONFIG REQUIRED)
+find_package(LLVM ${LLVM_VERSION} CONFIG REQUIRED)
 
 list(APPEND CMAKE_MODULE_PATH ${LLVM_DIR})
 include(AddLLVM)
diff --git a/Makefile b/Makefile
index 37a42714..4a1a556f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@
 NUMPROC ?= $(shell nproc)
 
 LLVM_CONFIG_PATH ?=
+LLVM_VERSION ?=
 CMAKE_CXX_FLAGS ?=
 CMAKE_EXE_LINKER_FLAGS ?=
 
@@ -39,7 +40,8 @@ debug/CMakeLists.txt:
 		-DCMAKE_BUILD_TYPE=Debug \
 		-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
-		-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH)
+		-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) \
+		-DLLVM_VERSION=${LLVM_VERSION}
 
 release/CMakeLists.txt:
 	cmake -S . -B release \
@@ -48,7 +50,8 @@ release/CMakeLists.txt:
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$(CMAKE_EXE_LINKER_FLAGS)" \
-		-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH)
+		-DLLVM_CONFIG_PATH=$(LLVM_CONFIG_PATH) \
+        -DLLVM_VERSION=${LLVM_VERSION}
 
 debug: debug/CMakeLists.txt
 	echo "Using ${NUMPROC} cores"