diff --git a/lib/awful/client.lua.in b/lib/awful/client.lua.in
index d91ce019..e4bb1282 100644
--- a/lib/awful/client.lua.in
+++ b/lib/awful/client.lua.in
@@ -362,11 +362,17 @@ setmetatable(swap, { __call = __swap })
 --- Get the master window.
 -- @param screen Optional screen number, otherwise screen mouse is used.
 -- @return The master window.
-function master(screen)
+function getmaster(screen)
     local s = screen or capi.mouse.screen
     return visible(s)[1]
 end
 
+--- Get the master window, deprecated, see getmaster().
+function master(screen)
+    util.deprecate()
+    getmaster(screen)
+end
+
 -- Set the client as slave: put it at the end of other windows.
 -- @param c The window to set as slave.
 function setslave(c)
@@ -454,7 +460,7 @@ function toggletag(target, c)
 end
 
 --- Toggle the floating status of a client.
--- @param c Optional client, the focused on if not set.
+-- @param c Optional client, the focused one if not set.
 function togglefloating(c)
     local sel = c or capi.client.focus
     if sel then