diff --git a/debian/i2pd.1 b/debian/i2pd.1
index 72b2c261..91e3b60f 100644
--- a/debian/i2pd.1
+++ b/debian/i2pd.1
@@ -60,19 +60,19 @@ The network interface to bind to for IPv4 connections
 \fB\-\-ifname6=\fR
 The network interface to bind to for IPv6 connections
 .TP
-\fB\-\-ipv4\fR
+\fB\-\-ipv4=\fR
 Enable communication through ipv6 (\fIenabled\fR by default)
 .TP
 \fB\-\-ipv6\fR
 Enable communication through ipv6 (\fIdisabled\fR by default)
 .TP
-\fB\-\-ntcp\fR
+\fB\-\-ntcp=\fR
 Enable usage of NTCP transport (\fIenabled\fR by default)
 .TP
 \fB\-\-ntcpproxy=\fR
 Set proxy URL for NTCP transport
 .TP
-\fB\-\-ssu\fR
+\fB\-\-ssu=\fR
 Enable usage of SSU transport (\fIenabled\fR by default)
 .TP
 \fB\-\-notransit\fR
diff --git a/libi2pd/Config.cpp b/libi2pd/Config.cpp
index 251e91df..1ff55dd6 100644
--- a/libi2pd/Config.cpp
+++ b/libi2pd/Config.cpp
@@ -45,9 +45,9 @@ namespace config {
 			("ifname", value<std::string>()->default_value(""),               "Network interface to bind to")
 			("ifname4", value<std::string>()->default_value(""),              "Network interface to bind to for ipv4")
 			("ifname6", value<std::string>()->default_value(""),              "Network interface to bind to for ipv6")
-			("nat", bool_switch()->default_value(true),                       "Should we assume we are behind NAT? (default: enabled)")
+			("nat", value<bool>()->default_value(true),                       "Should we assume we are behind NAT? (default: enabled)")
 			("port", value<uint16_t>()->default_value(0),                     "Port to listen for incoming connections (default: auto)")
-			("ipv4", bool_switch()->default_value(true),                      "Enable communication through ipv4 (default: enabled)")
+			("ipv4", value<bool>()->default_value(true),                      "Enable communication through ipv4 (default: enabled)")
 			("ipv6", bool_switch()->default_value(false),                     "Enable communication through ipv6 (default: disabled)")
 			("netid", value<int>()->default_value(I2PD_NET_ID),               "Specify NetID. Main I2P is 2")
 			("daemon", bool_switch()->default_value(false),                   "Router will go to background after start (default: disabled)")
@@ -56,10 +56,10 @@ namespace config {
 			("floodfill", bool_switch()->default_value(false),                "Router will be floodfill (default: disabled)")
 			("bandwidth", value<std::string>()->default_value(""),            "Bandwidth limit: integer in KBps or letters: L (32), O (256), P (2048), X (>9000)")
 			("share", value<int>()->default_value(100),                       "Limit of transit traffic from max bandwidth in percents. (default: 100)")
-			("ntcp", bool_switch()->default_value(true),                      "Enable NTCP transport (default: enabled)")
-			("ssu", bool_switch()->default_value(true),                       "Enable SSU transport (default: enabled)")
+			("ntcp", value<bool>()->default_value(true),                      "Enable NTCP transport (default: enabled)")
+			("ssu", value<bool>()->default_value(true),                       "Enable SSU transport (default: enabled)")
 			("ntcpproxy", value<std::string>()->default_value(""),            "Proxy URL for NTCP transport")
-			("ntcp2", bool_switch()->default_value(false),                    "Enable NTCP2 (experimental, default: disabled)")
+			("ntcp2", value<bool>()->default_value(false),                    "Enable NTCP2 (experimental, default: disabled)")
 #ifdef _WIN32
 			("svcctl", value<std::string>()->default_value(""),               "Windows service management ('install' or 'remove')")
 			("insomnia", bool_switch()->default_value(false),                 "Prevent system from sleeping (default: disabled)")