diff --git a/rc/xlock.lua b/rc/xlock.lua
index 5fecdfb..4249b5a 100644
--- a/rc/xlock.lua
+++ b/rc/xlock.lua
@@ -8,7 +8,3 @@ config.keys.global = awful.util.table.join(
    config.keys.global,
    awful.key({}, "XF86ScreenSaver", lock),
    awful.key({ modkey, }, "Delete", lock))
-
--- Configure xss-lock
-os.execute(awful.util.spawn(awful.util.getdir("config") ..
-                            "/bin/xss-lock start"))
diff --git a/xsession b/xsession
index 4a63b5c..56a8ea0 100644
--- a/xsession
+++ b/xsession
@@ -41,6 +41,7 @@ case "$(hostname)" in
         ;;
 esac
 
+~/.config/awesome/bin/xss-lock start &
 inputplug -0 -c ~/.config/awesome/bin/input-event 2> /dev/null
 #rfkill block all 2> /dev/null
 #xbacklight = 60 2> /dev/null