diff --git a/make/gettext.mk b/make/gettext.mk
index 18908d59..c07c0420 100644
--- a/make/gettext.mk
+++ b/make/gettext.mk
@@ -9,12 +9,12 @@ GETTEXT_MO ?= $(PROJECT).mo
 GETTEXT_INPUT_DIRS ?= $(TOPDIR)/tools
 GETTEXT_INPUT_FILES ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\
 	$(shell find $d -name '*.php' -o -name '*.cpp'))
+GETTEXT_KEYWORDS ?= htr
 
-all:
+all: $(GETTEXT_MO)
 clean: clean-mo
 	rm -rf *~ .*.swp
 install: install_MO
-all: $(GETTEXT_MO)
 distclean: clean
 
 extract: $(GETTEXT_POT)
@@ -23,7 +23,7 @@ clean-mo:
 
 $(GETTEXT_POT): $(GETTEXT_INPUT_FILES)
 	xgettext --package-name $(PROJECT) --package-version $(DIST_VERSION) \
-		--default-domain $(PROJECT) \
+		--default-domain $(PROJECT) $(addprefix -k,$(GETTEXT_KEYWORDS)) \
 		--output $@.tmp $(GETTEXT_INPUT_FILES)
 	mv $@.tmp $@
 
@@ -38,7 +38,7 @@ merge: $(GETTEXT_POT)
 		$(wildcard $(GETTEXT_PO)) $<
 	mv $(GETTEXT_PO).tmp $(GETTEXT_PO)
 
-edit: $(GETTEXT_POT)
+edit: merge $(GETTEXT_POT)
 	poedit $(GETTEXT_PO)
 
 $(GETTEXT_MO): $(GETTEXT_PO)