diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bdb166..8d4ee5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@
 
 find_package(docopt REQUIRED)
 find_package(Boost REQUIRED)
-find_library(REPLXX_LIBRARY replxx REQUIRED)
+find_library(REPLXX_LIBRARY NAMES replxx replxx-d REQUIRED)
 find_path(REPLXX_PATH replxx.hxx)
 if("${REPLXX_PATH}" STREQUAL REPLXX_PATH-NOTFOUND)
     message(FATAL_ERROR "Cannot find the \"replxx.hxx\" include file for the replxx library.")
diff --git a/src/main.cpp b/src/main.cpp
index 354114f..f702cb8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -42,7 +42,7 @@
         std::stringstream stream;
         auto completionsSet = parser.completeCommand(input, stream);
 
-        std::vector<std::string> res;
+        std::vector<replxx::Replxx::Completion> res;
         std::transform(completionsSet.begin(), completionsSet.end(), std::back_inserter(res),
                 [input](auto it) { return it; });
         return res;
diff --git a/submodules/dependencies b/submodules/dependencies
index 7b0a5a7..8ee76c5 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit 7b0a5a712febbeb0623f0d2b0b0d94ab2bf1bd40
+Subproject commit 8ee76c5204806f1e0298496015e2f49f7752003e