diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 0c18af2749a12aeedb6139db7746b71113489f89..d8c81a9a433427af941d21538bae3a0c86c4216b 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -29,7 +29,7 @@ extern "C" {
 using namespace dht;
 
 void print_usage() {
-    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]]" << std::endl << std::endl;
+    std::cout << "Usage: dhtnode [-v [-l logfile]] [-i] [-d] [-n network_id] [-p local_port] [-b bootstrap_host[:port]] [--proxyserver local_port]" << std::endl << std::endl;
     std::cout << "dhtnode, a simple OpenDHT command line node runner." << std::endl;
     std::cout << "Report bugs to: http://opendht.net" << std::endl;
 }
@@ -92,6 +92,9 @@ void cmd_loop(std::shared_ptr<DhtRunner>& dht, dht_params& params)
     std::map<std::string, indexation::Pht> indexes;
 #if OPENDHT_PROXY_SERVER
     std::map<in_port_t, std::unique_ptr<DhtProxyServer>> proxies;
+    if (params.proxyserver != 0) {
+        proxies.emplace(params.proxyserver, new DhtProxyServer(dht, params.proxyserver));
+    }
 #endif //OPENDHT_PROXY_SERVER
 
     while (true)
diff --git a/tools/tools_common.h b/tools/tools_common.h
index 933cc7e2aa246ef2e4e7227af0cd519af4934c15..cd3e197019c8841e59a6eb3cac1eab4251885754 100644
--- a/tools/tools_common.h
+++ b/tools/tools_common.h
@@ -121,6 +121,7 @@ struct dht_params {
     bool daemonize {false};
     bool service {false};
     std::pair<std::string, std::string> bootstrap {};
+    in_port_t proxyserver {0};
 };
 
 static const constexpr struct option long_options[] = {
@@ -134,6 +135,7 @@ static const constexpr struct option long_options[] = {
    {"service",    no_argument      , nullptr, 's'},
    {"logfile",    required_argument, nullptr, 'l'},
    {"syslog",     no_argument      , nullptr, 'L'},
+   {"proxyserver",required_argument, nullptr, 'S'},
    {nullptr,      0                , nullptr,  0}
 };
 
@@ -151,6 +153,14 @@ parseArgs(int argc, char **argv) {
                     std::cout << "Invalid port: " << port_arg << std::endl;
             }
             break;
+        case 'S': {
+                int port_arg = atoi(optarg);
+                if (port_arg >= 0 && port_arg < 0x10000)
+                    params.proxyserver = port_arg;
+                else
+                    std::cout << "Invalid port: " << port_arg << std::endl;
+            }
+            break;
         case 'n':
             params.network = strtoul(optarg, nullptr, 0);
             break;