diff --git a/client.c b/client.c
index 2884e656..b20526a6 100644
--- a/client.c
+++ b/client.c
@@ -178,6 +178,8 @@ client_unfocus_update(client_t *c)
         luaA_dofunction_from_registry(globalconf.L, globalconf.hooks.unfocus, 1, 0);
     }
 
+    luaA_object_push(globalconf.L, c);
+    luaA_class_emit_signal(globalconf.L, &client_class, "unfocus", 1);
 }
 
 /** Unfocus a client.
diff --git a/lib/awful/titlebar.lua.in b/lib/awful/titlebar.lua.in
index 600fe753..670d8b46 100644
--- a/lib/awful/titlebar.lua.in
+++ b/lib/awful/titlebar.lua.in
@@ -410,7 +410,7 @@ button_groups = { close_buttons,
 
 -- Register standards hooks
 capi.client.add_signal("focus", update)
-hooks.unfocus.register(update)
+capi.client.add_signal("unfocus", update)
 hooks.property.register(update)
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/taglist.lua.in b/lib/awful/widget/taglist.lua.in
index b0266542..ae704ab6 100644
--- a/lib/awful/widget/taglist.lua.in
+++ b/lib/awful/widget/taglist.lua.in
@@ -66,7 +66,7 @@ function new(screen, label, buttons)
     end
     local uc = function (c) return u(c.screen) end
     capi.client.add_signal("focus", uc)
-    hooks.unfocus.register(uc)
+    capi.client.add_signal("unfocus", uc)
     hooks.tags.register(u)
     hooks.tagged.register(uc)
     hooks.property.register(function (c, prop)
diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua.in
index 13b3a8c5..f78ae3fc 100644
--- a/lib/awful/widget/tasklist.lua.in
+++ b/lib/awful/widget/tasklist.lua.in
@@ -59,7 +59,7 @@ function new(label, buttons)
     hooks.clients.register(u)
     hooks.tagged.register(u)
     capi.client.add_signal("focus", u)
-    hooks.unfocus.register(u)
+    capi.client.add_signal("unfocus", u)
     hooks.property.register(function (c, prop)
         if type(c) ~= "client" then return end
         if prop == "urgent"