diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
index 61425ff9..1e02d422 100644
--- a/lib/awful/util.lua.in
+++ b/lib/awful/util.lua.in
@@ -138,9 +138,16 @@ function restart()
 end
 
 function getdir(d)
-    if d == "cache" then
-        if os.getenv("XDG_CACHE_HOME") then
-            return os.getenv("XDG_CACHE_HOME").."/awesome"
+    if d == "config" then
+        local dir = os.getenv("XDG_CONFIG_HOME")
+        if dir then
+            return dir .. "/awesome"
+        end
+        return os.getenv("HOME") .. "/.config/awesome"
+    elseif d == "cache" then
+        local dir = os.getenv("XDG_CACHE_HOME")
+        if dir then
+            return dir .. "/awesome"
         end
         return os.getenv("HOME").."/.cache/awesome"
     end