diff --git a/lib/awful/remote.lua.in b/lib/awful/remote.lua.in
index 7b3ed8a22..c090ba254 100644
--- a/lib/awful/remote.lua.in
+++ b/lib/awful/remote.lua.in
@@ -10,8 +10,8 @@ local loadstring = loadstring
 local tostring = tostring
 local ipairs = ipairs
 local table = table
+local unpack = unpack or table.unpack -- v5.1: unpack, v5.2: table.unpack
 local dbus = dbus
-local unpack = unpack
 local type = type
 
 --- Remote control module allowing usage of awesome-client.
diff --git a/lib/gears/color.lua.in b/lib/gears/color.lua.in
index 14d1aa45f..b19226220 100644
--- a/lib/gears/color.lua.in
+++ b/lib/gears/color.lua.in
@@ -7,8 +7,8 @@
 local setmetatable = setmetatable
 local string = string
 local table = table
+local unpack = unpack or table.unpack -- v5.1: unpack, v5.2: table.unpack
 local tonumber = tonumber
-local unpack = unpack
 local ipairs = ipairs
 local pairs = pairs
 local type = type
diff --git a/lib/wibox/widget/textbox.lua.in b/lib/wibox/widget/textbox.lua.in
index b09987f60..a439f6822 100644
--- a/lib/wibox/widget/textbox.lua.in
+++ b/lib/wibox/widget/textbox.lua.in
@@ -12,7 +12,6 @@ local cairo = lgi.cairo
 local Pango = lgi.Pango
 local PangoCairo = lgi.PangoCairo
 local type = type
-local unpack = unpack
 local setmetatable = setmetatable
 local pairs = pairs
 local error = error