diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c7cb8fcb..3f0723b93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,6 +113,7 @@ option(WITH_MYFILE_MMAP "Build using memory mapped file" ON)
 option(WITH_LTO "Build with link-time optimizations" OFF)
 option(WITH_SAN "Build with run-time sanitizer" OFF)
 option(WITH_PROF "Build with profiling instrumentation" OFF)
+option(WITH_SYSTEM_KLT "Build using system's KLT libraries." OFF)
 option(OPTION_OMP "Build with OpenMP support" ON)
 option(STRICT_MUTEX "True (recommended): MyMutex will behave like POSIX Mutex; False: MyMutex will behave like POSIX RecMutex; Note: forced to ON for Debug builds" ON)
 option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting std::out to a file is strongly recommended!" OFF)
@@ -293,10 +294,9 @@ find_package(JPEG REQUIRED)
 find_package(PNG REQUIRED)
 find_package(TIFF REQUIRED)
 find_package(ZLIB REQUIRED)
-option(USE_SYSTEM_KLT "Enable this option here or in cmake call if you want to use system's KLT libraries." OFF)
-if (USE_SYSTEM_KLT)
+if (WITH_SYSTEM_KLT)
   find_package (KLT REQUIRED)
-endif(USE_SYSTEM_KLT)
+endif(WITH_SYSTEM_KLT)
 
 # Link with bzip:
 if(WITH_BZIP)
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index 068d42a94..ea085d60e 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -111,7 +111,7 @@ set(RTENGINESOURCEFILES
     utils.cc
     )
 
-if (NOT USE_SYSTEM_KLT)
+if (NOT WITH_SYSTEM_KLT)
     set (RTENGINESOURCEFILES ${RTENGINESOURCEFILES}
 	klt/convolve.cc klt/error.cc klt/klt.cc klt/klt_util.cc klt/pnmio.cc klt/pyramid.cc klt/selectGoodFeatures.cc
 	klt/storeFeatures.cc klt/trackFeatures.cc klt/writeFeatures.cc