diff --git a/awesomerc.lua.in b/awesomerc.lua.in
index 2ced33e9..f7f59947 100644
--- a/awesomerc.lua.in
+++ b/awesomerc.lua.in
@@ -400,15 +400,12 @@ end
 
 -- Set up some hooks
 awful.hooks.focus(hook_focus)
-awful.hooks.focus(awful.client.focus.history.add)
 awful.hooks.unfocus(hook_unfocus)
 awful.hooks.marked(hook_marked)
 awful.hooks.unmarked(hook_unmarked)
 awful.hooks.manage(hook_manage)
-awful.hooks.unmanage(awful.client.focus.history.delete)
 awful.hooks.mouseover(hook_mouseover)
 awful.hooks.arrange(hook_arrange)
-awful.hooks.arrange(awful.tag.history.update)
 awful.hooks.timer(1, hook_timer)
 awful.hooks.titleupdate(hook_titleupdate)
 -- }}}
diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index 151a4c66..af6dc966 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -1031,4 +1031,9 @@ function P.titlebar.update(c, bg, fg, bg_focus, fg_focus)
     end
 end
 
+-- Register standards hooks
+P.hooks.arrange(P.tag.history.update)
+P.hooks.focus(P.client.focus.history.add)
+P.hooks.unmanage(P.client.focus.history.delete)
+
 return P