diff --git a/src/apps/deskflow-core/deskflow-core.cpp b/src/apps/deskflow-core/deskflow-core.cpp
index d469c8970..5260ffb1b 100644
--- a/src/apps/deskflow-core/deskflow-core.cpp
+++ b/src/apps/deskflow-core/deskflow-core.cpp
@@ -24,7 +24,12 @@ void showHelp()
   std::cout << "Usage: deskflow-core <server | client> [...options]" << std::endl;
   std::cout << "server - start as a server (deskflow-server)" << std::endl;
   std::cout << "client - start as a client (deskflow-client)" << std::endl;
-  std::cout << "use deskflow-core <server|client> --help for more information." << std::endl;
+
+  ServerApp sApp(nullptr);
+  sApp.help();
+
+  ClientApp cApp(nullptr);
+  cApp.help();
 }
 
 bool isServer(int argc, char **argv)
diff --git a/src/apps/res/manpage.txt b/src/apps/res/manpage.txt
index a03a0715c..993177b24 100644
--- a/src/apps/res/manpage.txt
+++ b/src/apps/res/manpage.txt
@@ -1,5 +1,5 @@
 [SEE ALSO]
-deskflow(1), deskflow-client(1), deskflow-server(2)
+deskflow(1), deskflow-core(1)
 
 All documentation is on the web, so please point your browser at
 <https://github.com/deskflow/deskflow/wiki> and surf away.
diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp
index 8a082802b..2c39c57db 100644
--- a/src/lib/deskflow/ClientApp.cpp
+++ b/src/lib/deskflow/ClientApp.cpp
@@ -99,7 +99,9 @@ void ClientApp::parseArgs(int argc, const char *const *argv)
 void ClientApp::help()
 {
   std::stringstream help;
-  help << "Usage: " << args().m_pname << " [--address <address>]"
+  help << "\n\nClient Mode:\n\n"
+       << "Usage: " << kAppId << "-core client"
+       << " [--address <address>]"
        << " [--yscroll <delta>]"
        << " [--sync-language]"
        << " [--invert-scroll]"
diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index 758ae3c45..2f9a1f733 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -100,8 +100,8 @@ void ServerApp::parseArgs(int argc, const char *const *argv)
 void ServerApp::help()
 {
   std::stringstream help;
-  help << "Usage: " << args().m_pname
-
+  help << "\n\nServer Mode:\n\n"
+       << "Usage: " << kAppId << "-core server"
        << " --config <pathname>"
        << " [--address <address>]"
 
@@ -110,9 +110,6 @@ void ServerApp::help()
 #endif
 
        << s_helpSysArgs << s_helpCommonArgs << "\n"
-       << "\n"
-       << "Start the " << kAppName << " mouse/keyboard sharing server.\n"
-       << "\n"
        << "  -a, --address <address>  listen for clients on the given address.\n"
        << "  -c, --config <pathname>  path of the configuration file\n"
        << s_helpGeneralArgs