diff --git a/contrib/i2pd.conf b/contrib/i2pd.conf
index 4dd21897..861e3866 100644
--- a/contrib/i2pd.conf
+++ b/contrib/i2pd.conf
@@ -7,7 +7,7 @@
 ## by removing the "#" symbol.
 
 ## Tunnels config file
-## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
+## Default: ~/.config/i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
 # tunconf = /var/lib/i2pd/tunnels.conf
 
 ## Where to write pidfile (don't write by default)
@@ -27,7 +27,7 @@
 # loglevel = info
 
 ## Path to storage of i2pd data (RI, keys, peer profiles, ...)
-## Default: ~/.i2pd or /var/lib/i2pd
+## Default: ~/.config/i2pd or /var/lib/i2pd
 # datadir = /var/lib/i2pd
 
 ## Daemon mode. Router will go to background after start
diff --git a/debian/i2pd.1 b/debian/i2pd.1
index e1390891..ae0b592f 100644
--- a/debian/i2pd.1
+++ b/debian/i2pd.1
@@ -22,13 +22,13 @@ Any of the configuration options below can be used in the \fBDAEMON_ARGS\fR vari
 Show available options.
 .TP
 \fB\-\-conf=\fR
-Config file (default: \fI~/.i2pd/i2pd.conf\fR or \fI/var/lib/i2pd/i2pd.conf\fR)
+Config file (default: \fI~/.config/i2pd/i2pd.conf\fR or \fI/var/lib/i2pd/i2pd.conf\fR)
 .BR
 This parameter will be silently ignored if the specified config file does not exist.
 Options specified on the command line take precedence over those in the config file.
 .TP
 \fB\-\-tunconf=\fR
-Tunnels config file (default: \fI~/.i2pd/tunnels.conf\fR or \fI/var/lib/i2pd/tunnels.conf\fR)
+Tunnels config file (default: \fI~/.config/i2pd/tunnels.conf\fR or \fI/var/lib/i2pd/tunnels.conf\fR)
 .TP
 \fB\-\-pidfile=\fR
 Where to write pidfile (don\'t write by default)
@@ -87,7 +87,7 @@ i2pd configuration files (when running as a system service)
 i2pd profile directory (when running as a system service, see \fB\-\-service\fR above)
 .RE
 .PP
-$HOME/.i2pd/
+$HOME/.config/i2pd/
 .RS 4
 i2pd profile directory (when running as a normal user)
 .RE
diff --git a/libi2pd/Config.cpp b/libi2pd/Config.cpp
index 4997852a..c4efa829 100644
--- a/libi2pd/Config.cpp
+++ b/libi2pd/Config.cpp
@@ -32,8 +32,8 @@ namespace config {
 		options_description general("General options");
 		general.add_options()
 			("help",                                                          "Show this message")
-			("conf", value<std::string>()->default_value(""),                 "Path to main i2pd config file (default: try ~/.i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)")
-			("tunconf", value<std::string>()->default_value(""),              "Path to config with tunnels list and options (default: try ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)")
+			("conf", value<std::string>()->default_value(""),                 "Path to main i2pd config file (default: try ~/.config/i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)")
+			("tunconf", value<std::string>()->default_value(""),              "Path to config with tunnels list and options (default: try ~/.config/i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)")
 			("pidfile", value<std::string>()->default_value(""),              "Path to pidfile (default: ~/i2pd/i2pd.pid or /var/lib/i2pd/i2pd.pid)")
 			("log", value<std::string>()->default_value(""),                  "Logs destination: stdout, file, syslog (stdout if not set)")
 			("logfile", value<std::string>()->default_value(""),              "Path to logfile (stdout if not set, autodetect if daemon)")
diff --git a/libi2pd/FS.h b/libi2pd/FS.h
index cb9b632d..ebee47da 100644
--- a/libi2pd/FS.h
+++ b/libi2pd/FS.h
@@ -82,7 +82,7 @@ namespace fs {
    *   Windows < Vista: C:\Documents and Settings\Username\Application Data\i2pd\
    *   Windows >= Vista: C:\Users\Username\AppData\Roaming\i2pd\
    *   Mac: /Library/Application Support/i2pd/ or ~/Library/Application Support/i2pd/
-   *   Unix: /var/lib/i2pd/ (system=1) >> ~/.i2pd/ or /tmp/i2pd/
+   *   Unix: /var/lib/i2pd/ (system=1) >> ~/.config/i2pd/ or /tmp/i2pd/
    */
   void DetectDataDir(const std::string & cmdline_datadir, bool isService = false);