diff --git a/client.c b/client.c
index bcb75ab36..560c7a454 100644
--- a/client.c
+++ b/client.c
@@ -1491,6 +1491,17 @@ luaA_client_index(lua_State *L)
       case A_TK_URGENT:
         lua_pushboolean(L, (*c)->isurgent);
         break;
+      case A_TK_SIZEHINTS:
+        lua_newtable(L);
+        lua_pushboolean(L, (*c)->size_hints.flags & XCB_SIZE_HINT_US_POSITION);
+        lua_setfield(L, -2, "user_position");
+        lua_pushboolean(L, (*c)->size_hints.flags & XCB_SIZE_HINT_US_SIZE);
+        lua_setfield(L, -2, "user_size");
+        lua_pushboolean(L, (*c)->size_hints.flags & XCB_SIZE_HINT_P_POSITION);
+        lua_setfield(L, -2, "program_position");
+        lua_pushboolean(L, (*c)->size_hints.flags & XCB_SIZE_HINT_P_SIZE);
+        lua_setfield(L, -2, "program_size");
+        break;
       default:
         return 0;
     }
diff --git a/common/tokenize.gperf b/common/tokenize.gperf
index bed67de75..913e3a735 100644
--- a/common/tokenize.gperf
+++ b/common/tokenize.gperf
@@ -59,6 +59,7 @@ selected
 shadow
 shadow_offset
 show_icons
+sizehints
 south
 sticky
 text