diff --git a/README b/README
index 058bf8cd..0a9a2a9e 100644
--- a/README
+++ b/README
@@ -1556,6 +1556,18 @@ The default directories storing config file are:
    (Linux)   ~/.config/dosbox/
    (macOS)   ~/Library/Preferences/DOSBox/
 
+Linux users:
+    The configuration's parent-directory can be customized by setting
+    the XDG_DATA_HOME environment variable, per the XDG Base Directory
+    Specification. If set, DOSBox will use $XDG_CONFIG_HOME/dosbox/ for
+    its configuration path.
+
+Windows users:
+    In Windows Vista or newer, the configuration file won't work correctly
+    if it is located in "Windows" or "Program Files" folder or their subfolders,
+    or directly on C:\, so the best place for storing extra configuration files
+    is next to the default config directory or for example: C:\oldgames
+
 The file is divided into several sections. Each section starts with a
 [section name] line. The settings are the property=value lines where value can
 be altered to customize DOSBox.
@@ -1571,12 +1583,6 @@ specified, it will try to load "dosbox.conf" from the local directory.
 If there is none, DOSBox will load the user configuration file.
 This file will be created if it doesn't exist.
 
-Important!: In Windows Vista/7 the configuration file won't work correctly
-if it is located in "Windows" or "Program Files" folder or their subfolders,
-or directly on c:\, so the best place for storing extra configuration files is
-for example: C:\oldgames
-
-
 
 ======================
 14. The Language File:
diff --git a/docs/dosbox.1 b/docs/dosbox.1
index 17c929a1..39dfdc53 100644
--- a/docs/dosbox.1
+++ b/docs/dosbox.1
@@ -285,8 +285,9 @@ If no configfile is specified at the commandline, a file named
 loaded automatically. If a configfile is specified at the commandline
 that one will be used instead. If no configfile is specified or found
 in the current directory
-.RB " then dosbox will load one from " ~/.config/dosbox/ ". It will try to create "
-one if there is none.
+.RB " then dosbox will load one from " $XDG_CONFIG_HOME/dosbox/ "
+.RB " (which defaults to " ~/.config/dosbox/ "). It will try to create a
+new default config file if it does not exist yet.
 .SH "SPECIAL KEYS"
 .TP 12m
 .IP ALT\-ENTER