diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8803747263..313e91a424 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -695,25 +695,23 @@ endif ()
 ################################################################################
 
 if (MSVC)
-  set(READLINE_LIBS linenoise CACHE string "LINENOISE libraries")
-  set(READLINE_VERSION "linenoise" CACHE string "LINENOISE version")
+  set(LINENOISE_LIBS linenoise CACHE string "LINENOISE libraries")
+  set(LINENOISE_VERSION "linenoise" CACHE string "LINENOISE version")
 else ()
-  set(READLINE_INCLUDE "" CACHE path "READLINE include path")
-  set(READLINE_LIB_PATH "" CACHE path "READLINE library path")
-  set(READLINE_LIBS readline CACHE string "READLINE libraries")
-  set(READLINE_VERSION "unknown" CACHE string "READLINE version")
+  set(LINENOISE_INCLUDE "" CACHE path "LINENOISE include path")
+  set(LINENOISE_LIB_PATH "" CACHE path "LINENOISE library path")
+  set(LINENOISE_LIBS readline CACHE string "LINENOISE libraries")
+  set(LINENOISE_VERSION "unknown" CACHE string "LINENOISE version")
 endif ()
 
-if (READLINE_INCLUDE)
-  include_directories(${READLINE_INCLUDE})
+if (LINENOISE_INCLUDE)
+  include_directories(${LINENOISE_INCLUDE})
 endif ()
 
-if (READLINE_LIB_PATH)
-  link_directories(${READLINE_LIB_PATH})
+if (LINENOISE_LIB_PATH)
+  link_directories(${LINENOISE_LIB_PATH})
 endif ()
 
-add_definitions("-DTRI_READLINE_VERSION=\"${READLINE_VERSION}\"")
-
 ################################################################################
 ### @brief V8
 ################################################################################
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index 6e3609045a..dd02cda538 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -279,6 +279,7 @@ target_link_libraries(
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
     ${MSVC_LIBS}
diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt
index c3372b642d..13061985d7 100644
--- a/arangosh/CMakeLists.txt
+++ b/arangosh/CMakeLists.txt
@@ -48,6 +48,7 @@ target_link_libraries(
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${MSVC_LIBS}
 )
@@ -97,6 +98,7 @@ target_link_libraries(
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${MSVC_LIBS}
 )
@@ -147,6 +149,7 @@ target_link_libraries(
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${MSVC_LIBS}
 )
@@ -195,6 +198,7 @@ target_link_libraries(
     ${ICU_LIBS}
     ${BT_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${MSVC_LIBS}
 )
@@ -247,6 +251,7 @@ target_link_libraries(
     ${BT_LIBS}
     ${ICU_LIBS}
     ${ZLIB_LIBS}
+    ${LINENOISE_LIBS}
     ${OPENSSL_LIBS}
     ${MSVC_LIBS}
 )