diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b1ff69b..74c39477 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ set(WITH_CRYPTONOTE ON)
 set(WITH_CRYPTO_OPS ON)
 set(WITH_COM        ON)
 set(WITH_EVENTS     OFF)
-set(WITH_GHOSTRIDER OFF)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/base/cmake" "${CMAKE_SOURCE_DIR}/cmake")
 set(LIBS base)
@@ -170,6 +169,7 @@ include_directories(src/3rdparty)
 include(randomx)
 include(argon2)
 include(kawpow)
+include(ghostrider)
 include(asm)
 
 if (WITH_EMBEDDED_CONFIG)
diff --git a/cmake/ghostrider.cmake b/cmake/ghostrider.cmake
index 3bc935b1..56dbd6e4 100644
--- a/cmake/ghostrider.cmake
+++ b/cmake/ghostrider.cmake
@@ -1,8 +1,4 @@
 if (WITH_GHOSTRIDER)
-    add_definitions(/DXMRIG_ALGO_GHOSTRIDER)
     add_subdirectory(src/crypto/ghostrider)
-    set(GHOSTRIDER_LIBRARY ghostrider)
-else()
-    remove_definitions(/DXMRIG_ALGO_GHOSTRIDER)
-    set(GHOSTRIDER_LIBRARY "")
+    list(APPEND LIBS ghostrider)
 endif()
diff --git a/src/crypto/ghostrider/CMakeLists.txt b/src/crypto/ghostrider/CMakeLists.txt
index 6b3f25dd..f0df523a 100644
--- a/src/crypto/ghostrider/CMakeLists.txt
+++ b/src/crypto/ghostrider/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1)
 project(GhostRider)
 
 set(HEADERS
@@ -80,6 +80,7 @@ endif()
 
 include_directories(.)
 include_directories(../..)
+include_directories(../../base)
 include_directories(${UV_INCLUDE_DIR})
 
 add_library(ghostrider STATIC ${HEADERS} ${SOURCES})