diff --git a/src/keycodemapdb b/src/keycodemapdb
index 6280c94f30..317d3eeb96 160000
--- a/src/keycodemapdb
+++ b/src/keycodemapdb
@@ -1 +1 @@
-Subproject commit 6280c94f306df6a20bbc100ba15a5a81af0366e6
+Subproject commit 317d3eeb963a515e15a63fa356d8ebcda7041a51
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index 0855f152fd..ec10e53606 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -310,7 +310,7 @@ util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \
 					      -e 's,\.h,,'` && \
 		$(MKDIR_P) util/ && \
 		$(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \
-			--lang stdc --varname virKeyCodeTable_$$NAME code-table \
+			code-table --lang stdc --varname virKeyCodeTable_$$NAME \
 			$(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \
 		mv $@-tmp $@ || rm -f $@-tmp
 
@@ -320,7 +320,7 @@ util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \
 					      -e 's,\.h,,'` && \
 		$(MKDIR_P) util/ && \
 		$(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \
-			--lang stdc --varname virKeyNameTable_$$NAME name-table \
+			name-table --lang stdc --varname virKeyNameTable_$$NAME \
 			$(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \
 		mv $@-tmp $@ || rm -f $@-tmp
 
@@ -330,9 +330,9 @@ util/virkeycode-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \
 					      -e 's,\.pod,,'` && \
 		$(MKDIR_P) util/ && \
 		$(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \
-		--lang pod \
-		--varname "virkeycode-$$NAME - Key code values for $$NAME" \
-		code-docs \
+		code-docs --lang pod \
+		--title "virkeycode-$$NAME" \
+		--subtitle "Key code values for $$NAME" \
 		$(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \
 			$@-tmp && mv $@-tmp $@ || rm $@-tmp
 
@@ -342,9 +342,9 @@ util/virkeyname-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \
 					      -e 's,\.pod,,'` && \
 		$(MKDIR_P) util/ && \
 		$(RUNUTF8) $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \
-		--lang pod \
-		--varname "virkeyname-$$NAME - Key name values for $$NAME" \
-		name-docs \
+		name-docs --lang pod \
+		--title "virkeyname-$$NAME" \
+		--subtitle "Key name values for $$NAME" \
 		$(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \
 			$@-tmp && mv $@-tmp $@ || rm $@-tmp