diff --git a/common/tokenize.gperf b/common/tokenize.gperf
index 80573e8e..57e53ac2 100644
--- a/common/tokenize.gperf
+++ b/common/tokenize.gperf
@@ -34,6 +34,7 @@ flex
 floating
 focus
 font
+font_height
 fullscreen
 gap
 geometry
diff --git a/luaa.c b/luaa.c
index fb173c7b..1f41bd56 100644
--- a/luaa.c
+++ b/luaa.c
@@ -564,6 +564,7 @@ luaA_isloop(lua_State *L, int idx)
  * \return The number of elements pushed on stack.
  * \luastack
  * \lfield font The default font.
+ * \lfield font_height The default font height.
  * \lfield conffile The configuration file which has been loaded.
  */
 static int
@@ -584,6 +585,9 @@ luaA_awesome_index(lua_State *L)
             g_free(font);
         }
         break;
+      case A_TK_FONT_HEIGHT:
+        lua_pushnumber(L, globalconf.font->height);
+        break;
       case A_TK_CONFFILE:
         lua_pushstring(L, globalconf.conffile);
         break;