diff --git a/Daemon.cpp b/Daemon.cpp
index ad61a130..0d2a52c4 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -78,6 +78,7 @@ namespace i2p
 				i2p::context.UpdateAddress (boost::asio::ip::address::from_string (host));	
 
 			i2p::context.SetSupportsV6 (i2p::util::config::GetArg("-v6", 0));
+			i2p::context.SetAcceptsTunnels (!i2p::util::config::GetArg("-notransit", 0));
 			bool isFloodfill = i2p::util::config::GetArg("-floodfill", 0);
 			i2p::context.SetFloodfill (isFloodfill);
 			auto bandwidth = i2p::util::config::GetArg("-bandwidth", "");
diff --git a/docs/configuration.md b/docs/configuration.md
index 57c038de..a6de600f 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -13,6 +13,7 @@ i2pd cmdline options
 * --v6=                 - 1 if supports communication through ipv6, off by default
 * --floodfill=          - 1 if router is floodfill, off by default
 * --bandwidth=          - L if bandwidth is limited to 32Kbs/sec, O - to 256Kbs/sec, P - unlimited
+* --notransit=          - 1 if router doesn't accept transit tunnels at startup. 0 by default
 * --httpproxyaddress=   - The address to listen on (HTTP Proxy)
 * --httpproxyport=      - The port to listen on (HTTP Proxy) 4446 by default
 * --socksproxyaddress=  - The address to listen on (SOCKS Proxy)