diff --git a/defs/keywords b/defs/keywords
index 7f5422faef..fc30ec2d15 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -1,5 +1,5 @@
 %{
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
 static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
diff --git a/defs/lex.c.src b/defs/lex.c.src
index 7f5422faef..fc30ec2d15 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -1,5 +1,5 @@
 %{
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
 static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
diff --git a/lex.c.blt b/lex.c.blt
index d93a0b84b5..92a4793b00 100644
--- a/lex.c.blt
+++ b/lex.c.blt
@@ -31,7 +31,7 @@
 #define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "defs/keywords"
 
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
 static const struct kwtable *reserved_word(/*const char *, unsigned int*/);