diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd1dc1fd9..67d5c5be3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,8 +220,7 @@ if(NOT WIN32)
 endif()
 add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3)
 add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
-# XXX: activate when we're clean of deprecated Boost.FS features
-# add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 find_package(Threads REQUIRED)
diff --git a/src/tools/contract.cpp b/src/tools/contract.cpp
index 5bc65c5ed..c9460db18 100644
--- a/src/tools/contract.cpp
+++ b/src/tools/contract.cpp
@@ -61,8 +61,9 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
     boost::program_options::options_description cmdline_options;
     cmdline_options.add(generic_options).add(config_options).add(hidden_options);
 
+    const auto* executable = argv[0];
     boost::program_options::options_description visible_options(
-        "Usage: " + boost::filesystem::basename(argv[0]) + " <input.osrm> [options]");
+        "Usage: " + boost::filesystem::path(executable).filename().string() + " <input.osrm> [options]");
     visible_options.add(generic_options).add(config_options);
 
     // parse command line options
diff --git a/src/tools/extract.cpp b/src/tools/extract.cpp
index 4c5fa4cb3..672ada2fb 100644
--- a/src/tools/extract.cpp
+++ b/src/tools/extract.cpp
@@ -64,8 +64,9 @@ return_code parseArguments(int argc, char *argv[], extractor::ExtractorConfig &e
     boost::program_options::options_description cmdline_options;
     cmdline_options.add(generic_options).add(config_options).add(hidden_options);
 
+    const auto* executable = argv[0];
     boost::program_options::options_description visible_options(
-        boost::filesystem::basename(argv[0]) + " <input.osm/.osm.bz2/.osm.pbf> [options]");
+        boost::filesystem::path(executable).filename().string() + " <input.osm/.osm.bz2/.osm.pbf> [options]");
     visible_options.add(generic_options).add(config_options);
 
     // parse command line options
diff --git a/src/tools/routed.cpp b/src/tools/routed.cpp
index fdf14b2f6..831a9cd25 100644
--- a/src/tools/routed.cpp
+++ b/src/tools/routed.cpp
@@ -111,7 +111,7 @@ generateServerProgramOptions(const int argc,
 
     const auto* executable = argv[0];
     boost::program_options::options_description visible_options(
-        boost::filesystem::path(executable).stem().string() + " <base.osrm> [<options>]");
+        boost::filesystem::path(executable).filename().string() + " <base.osrm> [<options>]");
     visible_options.add(generic_options).add(config_options);
 
     // parse command line options
diff --git a/src/tools/store.cpp b/src/tools/store.cpp
index 7866cf3be..9e7cbbc5e 100644
--- a/src/tools/store.cpp
+++ b/src/tools/store.cpp
@@ -35,8 +35,9 @@ bool generateDataStoreOptions(const int argc, const char *argv[], boost::filesys
     boost::program_options::options_description cmdline_options;
     cmdline_options.add(generic_options).add(config_options).add(hidden_options);
 
+    const auto* executable = argv[0];
     boost::program_options::options_description visible_options(
-        boost::filesystem::basename(argv[0]) + " [<options>] <configuration>");
+        boost::filesystem::path(executable).filename().string() + " [<options>] <configuration>");
     visible_options.add(generic_options).add(config_options);
 
     // print help options if no infile is specified