diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index db7957a..b9cc041 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -131,6 +131,11 @@ $(POTDIR)/%.pot: %.c
 
 	@touch $@
 
+$(POTDIR)/%.pot: \
+	./%/*
+ 
+	@$(MAKE) -C $(basename $(notdir $@)) $@
+
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
@@ -139,8 +144,12 @@ all: \
 Release: \
 	$(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT)
 
+pot: \
+	$(BASEDIR)/.pot/pw3270.pot
+
 $(BASEDIR)/.pot/pw3270.pot: \
-	$(foreach SRC, $(basename $(LIB_SOURCES) $(APP_SOURCES)), $(POTDIR)/$(SRC).pot)
+	$(foreach SRC, $(basename $(LIB_SOURCES) $(APP_SOURCES)), $(POTDIR)/$(SRC).pot) \
+	$(foreach MOD, $(MODULES), $(POTDIR)/$(MOD).pot)
 
 	@rm -f $@
 	@mkdir -p `dirname $@`
diff --git a/src/pw3270/common/Makefile.in b/src/pw3270/common/Makefile.in
index 314d4ff..ec4967b 100644
--- a/src/pw3270/common/Makefile.in
+++ b/src/pw3270/common/Makefile.in
@@ -41,6 +41,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
 OBJDBG=$(OBJDIR)/Debug
@@ -50,6 +51,8 @@ MKDIR=@MKDIR_P@
 CC=@CC@
 LD=@CC@
 AR=@AR@
+XGETTEXT=@XGETTEXT@
+MSGCAT=@MSGCAT@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -80,6 +83,21 @@ $(OBJRLS)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"` \
 				-o $@ -c $<
 
+$(POTDIR)/%.pot: %.c
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(XGETTEXT) \
+		--default-domain=$(PACKAGE) \
+		--language=C \
+		--keyword=_ \
+		--keyword=N_ \
+		--keyword=MSG_:2 \
+		--output=$@ \
+		$<
+
+	@touch $@
+
 #---[ Release Targets ]------------------------------------------------------------------
 
 Release: \
@@ -92,6 +110,16 @@ $(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
 	@$(MKDIR) `dirname $@`
 	@$(AR) rcs $@ $^
 
+pot: \
+	$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
+
+$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
+	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
+
+	@rm -f $@
+	@mkdir -p `dirname $@`
+	@$(MSGCAT) --sort-output $^ > $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/uiparser/Makefile.in b/src/pw3270/uiparser/Makefile.in
index 31ffc36..b75d672 100644
--- a/src/pw3270/uiparser/Makefile.in
+++ b/src/pw3270/uiparser/Makefile.in
@@ -43,6 +43,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
 OBJDBG=$(OBJDIR)/Debug
@@ -52,6 +53,8 @@ MKDIR=@MKDIR_P@
 CC=@CC@
 LD=@CC@
 AR=@AR@
+XGETTEXT=@XGETTEXT@
+MSGCAT=@MSGCAT@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -82,6 +85,21 @@ $(OBJRLS)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"` \
 				-o $@ -c $<
 
+$(POTDIR)/%.pot: %.c
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(XGETTEXT) \
+		--default-domain=$(PACKAGE) \
+		--language=C \
+		--keyword=_ \
+		--keyword=N_ \
+		--keyword=MSG_:2 \
+		--output=$@ \
+		$<
+
+	@touch $@
+
 marshal.h: \
 	genmarshal
 
@@ -108,6 +126,16 @@ $(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
 	@$(MKDIR) `dirname $@`
 	@$(AR) rcs $@ $^
 
+pot: \
+	$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
+
+$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
+	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
+
+	@rm -f $@
+	@mkdir -p `dirname $@`
+	@$(MSGCAT) --sort-output $^ > $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
diff --git a/src/pw3270/v3270/Makefile.in b/src/pw3270/v3270/Makefile.in
index 93656be..0b58414 100644
--- a/src/pw3270/v3270/Makefile.in
+++ b/src/pw3270/v3270/Makefile.in
@@ -42,6 +42,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
 OBJDBG=$(OBJDIR)/Debug
@@ -52,6 +53,8 @@ CC=@CC@
 LD=@CC@
 AR=@AR@
 GENMARSHAL=@GENMARSHAL@
+XGETTEXT=@XGETTEXT@
+MSGCAT=@MSGCAT@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -82,6 +85,21 @@ $(OBJRLS)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"` \
 				-o $@ -c $<
 
+$(POTDIR)/%.pot: %.c
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(XGETTEXT) \
+		--default-domain=$(PACKAGE) \
+		--language=C \
+		--keyword=_ \
+		--keyword=N_ \
+		--keyword=MSG_:2 \
+		--output=$@ \
+		$<
+
+	@touch $@
+
 marshal.h: \
 	genmarshal
 
@@ -108,6 +126,16 @@ $(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
 	@$(MKDIR) `dirname $@`
 	@$(AR) rcs $@ $^
 
+pot: \
+	$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
+
+$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
+	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
+
+	@rm -f $@
+	@mkdir -p `dirname $@`
+	@$(MSGCAT) --sort-output $^ > $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
@@ -132,8 +160,10 @@ cleanRelease:
 	@rm -fr	$(BASEDIR)/.obj/Release/$(MODULE_NAME).a \
 			$(OBJRLS)
 
+	@rm -fr $(POTDIR)
+
 clean: \
 	cleanDebug \
 	cleanRelease
 
-
+	
diff --git a/src/pw3270/v3270ft/Makefile.in b/src/pw3270/v3270ft/Makefile.in
index 2ed0282..b2446bd 100644
--- a/src/pw3270/v3270ft/Makefile.in
+++ b/src/pw3270/v3270ft/Makefile.in
@@ -42,6 +42,7 @@ sbindir=@sbindir@
 libdir=@libdir@
 
 BASEDIR=@BASEDIR@
+POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
 
 OBJDIR=.obj
 OBJDBG=$(OBJDIR)/Debug
@@ -52,6 +53,8 @@ CC=@CC@
 LD=@CC@
 AR=@AR@
 GENMARSHAL=@GENMARSHAL@
+XGETTEXT=@XGETTEXT@
+MSGCAT=@MSGCAT@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
 LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
@@ -82,6 +85,21 @@ $(OBJRLS)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"` \
 				-o $@ -c $<
 
+$(POTDIR)/%.pot: %.c
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(XGETTEXT) \
+		--default-domain=$(PACKAGE) \
+		--language=C \
+		--keyword=_ \
+		--keyword=N_ \
+		--keyword=MSG_:2 \
+		--output=$@ \
+		$<
+
+	@touch $@
+
 marshal.h: \
 	genmarshal
 
@@ -108,6 +126,16 @@ $(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
 	@$(MKDIR) `dirname $@`
 	@$(AR) rcs $@ $^
 
+pot: \
+	$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
+
+$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
+	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
+
+	@rm -f $@
+	@mkdir -p `dirname $@`
+	@$(MSGCAT) --sort-output $^ > $@
+
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
--
libgit2 0.21.2