diff --git a/programs/cleos/config.hpp.in b/programs/cleos/config.hpp.in
index 37081daf3f47f49100fb5d685502d59378c29856..18673e9c8c2daf692b4e305d31df61ab00502163 100644
--- a/programs/cleos/config.hpp.in
+++ b/programs/cleos/config.hpp.in
@@ -8,4 +8,5 @@ namespace eosio { namespace client { namespace config {
    constexpr char version_str[] = "${cleos_BUILD_VERSION}";
    constexpr char locale_path[] = "${LOCALEDIR}";
    constexpr char locale_domain[] = "${LOCALEDOMAIN}";
+   constexpr char key_store_executable_name[] = "${KEY_STORE_EXECUTABLE_NAME}";
 }}}
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
index b24e7343c30e4850bac6a7fcad1c8c47f8e750d8..c4b0f654ae6319f70e81bb4d32791f3ad26b05bb 100644
--- a/programs/cleos/main.cpp
+++ b/programs/cleos/main.cpp
@@ -763,9 +763,9 @@ void ensure_keosd_running(CLI::App* app) {
     // This extra check is necessary when running cleos like this: ./cleos ...
     if (binPath.filename_is_dot())
         binPath.remove_filename();
-    binPath.append("keosd"); // if cleos and keosd are in the same installation directory
+    binPath.append(key_store_executable_name); // if cleos and keosd are in the same installation directory
     if (!boost::filesystem::exists(binPath)) {
-        binPath.remove_filename().remove_filename().append("keosd").append("keosd");
+        binPath.remove_filename().remove_filename().append("keosd").append(key_store_executable_name);
     }
 
     const auto& lo_address = resolved_url.resolved_addresses.front();