diff --git a/debian/tunnels.conf b/debian/tunnels.conf
index f710b70c..fa92a56b 100644
--- a/debian/tunnels.conf
+++ b/debian/tunnels.conf
@@ -1,7 +1,33 @@
 [IRC]
 type = client
+address = 127.0.0.1
 port = 6668
 destination = irc.postman.i2p
+destinationport = 6667
 keys = irc-keys.dat
 
+#[SMTP]
+#type = client
+#address = 127.0.0.1
+#port = 7659
+#destination = smtp.postman.i2p
+#destinationport = 25
+#keys = smtp-keys.dat
+
+#[POP3]
+#type = client
+#address = 127.0.0.1
+#port = 7660
+#destination = pop.postman.i2p
+#destinationport = 110
+#keys = pop3-keys.dat
+
+#[MTN]
+#type = client
+#address = 127.0.0.1
+#port = 8998
+#destination = mtn.i2p-projekt.i2p
+#destinationport = 4691
+#keys = mtn-keys.dat
+
 # see more examples in /usr/share/doc/i2pd/configuration.md.gz
diff --git a/docs/i2pd.conf b/docs/i2pd.conf
index d4ea226a..aa112a4b 100644
--- a/docs/i2pd.conf
+++ b/docs/i2pd.conf
@@ -22,7 +22,7 @@
 ##  * syslog - use syslog, see man 3 syslog
 # log = file
 ## Path to logfile (default - autodetect)
-# logfile = /var/log/i2pd.log
+# logfile = /var/log/i2pd/i2pd.log
 ## Log messages above this level (debug, *info, warn, error)
 # loglevel = info
 
@@ -42,14 +42,18 @@
 ## Port to listen for connections
 ## By default i2pd picks random port. You MUST pick a random number too,
 ## don't just uncomment this
-# port = 4321
+# port = 4567
+
+## Enable communication through ipv4
+ipv4 = true
 
 ## Enable communication through ipv6
-ipv6 = true
+ipv6 = false
 
 ## Bandwidth configuration
-## L limit bandwidth to 32Kbs/sec, O - to 256Kbs/sec, P - unlimited
-## Default is P for floodfill, L for regular node
+## L limit bandwidth to 32Kbs/sec, O - to 256Kbs/sec, P - to 2048Kbs/sec,
+## X - unlimited
+## Default is X for floodfill, L for regular node
 # bandwidth = L
 
 ## Router will not accept transit tunnels at startup
@@ -58,6 +62,15 @@ ipv6 = true
 ## Router will be floodfill
 # floodfill = true
 
+[limits]
+## Maximum active transit sessions (default:2500)
+# transittunnels = 2500
+
+[precomputation]
+## Enable or disable elgamal precomputation table
+## By default, enabled on i386 hosts
+# elgamal = true
+
 [http]
 ## Uncomment and set to 'false' to disable Web Console
 # enabled = true
@@ -78,10 +91,11 @@ port = 4444
 ## Uncomment and set to 'false' to disable SOCKS Proxy
 # enabled = true
 ## Address and port service will listen on
-# address = 127.0.0.1
-# port = 4447
+address = 127.0.0.1
+port = 4447
 ## Optional keys file for proxy local destination
 # keys = socks-proxy-keys.dat
+
 ## Socks outproxy. Example below is set to use Tor for all connections except i2p
 ## Address and port of outproxy
 # outproxy = 127.0.0.1
@@ -101,6 +115,13 @@ port = 4444
 # address = 127.0.0.1
 # port = 2827
 
+[i2cp]
+## Uncomment and set to 'true' to enable I2CP protocol
+# enabled = false
+## Address and port service will listen on
+# address = 127.0.0.1
+# port = 7654
+
 [i2pcontrol]
 ## Uncomment and set to 'true' to enable I2PControl protocol
 # enabled = false