diff --git a/CHANGELOG b/CHANGELOG
index 088bd54..91317a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
 *******************************************************************************
 
 === 1.0.31 ===
-
+* Fixed $XDG_CONFIG_HOME being ignored.
 
 === 1.0.30 ===
 * Added possibility to perform casted fetch from expr::value_t.
diff --git a/src/main/runtime/system.cpp b/src/main/runtime/system.cpp
index a768a78..552b590 100644
--- a/src/main/runtime/system.cpp
+++ b/src/main/runtime/system.cpp
@@ -293,11 +293,15 @@ namespace lsp
                 }
             }
 #else
-            status_t res = get_env_var("HOME", &upath);
+            status_t res = get_env_var("XDG_CONFIG_HOME", &upath);
             if (res != STATUS_OK)
-                return res;
-            if (!upath.append_ascii(FILE_SEPARATOR_S ".config"))
-                return STATUS_NO_MEM;
+            {
+                res = get_env_var("HOME", &upath);
+                if (res != STATUS_OK)
+                    return res;
+                if (!upath.append_ascii(FILE_SEPARATOR_S ".config"))
+                    return STATUS_NO_MEM;
+            }
 #endif /* PLATFORM_WINDOWS */
 
             path->swap(&upath);