diff --git a/make/gettext.mk b/make/gettext.mk
index 3c643db1..413b4dd9 100644
--- a/make/gettext.mk
+++ b/make/gettext.mk
@@ -7,8 +7,8 @@ include $(JWBDIR)/make/dev-utils.mk
 GETTEXT_PROJECT_PO          ?= $(PROJECT).po
 GETTEXT_PROJECT_POT         ?= $(PROJECT).pot
 
-GETTEXT_PO                  ?= $(wildcard *.po)
-GETTEXT_POT                 ?= $(patsubst %.po,%.pot,$(GETTEXT_PO))
+GETTEXT_POT                 ?= $(wildcard *.pot)
+GETTEXT_PO                  ?= $(patsubst %.pot,%.po,$(GETTEXT_POT))
 GETTEXT_MO                  ?= $(patsubst %.po,%.mo,$(GETTEXT_PO))
 GETTEXT_INPUT_DIRS          ?= $(wildcard $(TOPDIR)/tools $(TOPDIR)/src $(TOPDIR)/conf)
 GETTEXT_INPUT_FILES         ?= $(foreach d,$(GETTEXT_INPUT_DIRS),\
@@ -21,6 +21,7 @@ clean: clean-mo
 	$(RM) -rf *~ .*.swp
 install: install_MO
 distclean: clean
+test:
 
 extract: $(GETTEXT_POT)
 clean-mo:
@@ -43,6 +44,15 @@ merge: $(GETTEXT_PROJECT_POT)
 		$(wildcard $(GETTEXT_PROJECT_PO)) $<
 	mv $(GETTEXT_PROJECT_PO).tmp $(GETTEXT_PROJECT_PO)
 
+merge-pot: $(GETTEXT_POT)
+	msgmerge -v --lang $(GETTEXT_LOCALE) --output-file $(GETTEXT_PROJECT_PO).tmp \
+		$(wildcard $(GETTEXT_PROJECT_PO)) $<
+	mv $(GETTEXT_PROJECT_PO).tmp $(GETTEXT_PROJECT_PO)
+
+$(GETTEXT_PROJECT_PO): $(GETTEXT_POT)
+	msgcat --lang $(GETTEXT_LOCALE) --output-file $@.tmp $^
+	mv $@.tmp $@
+
 edit: merge $(GETTEXT_PROJECT_POT)
 	poedit $(GETTEXT_PROJECT_PO)