diff --git a/Makefile.in b/Makefile.in
index b0849c1..8d286ac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,8 @@ MKDIR=@MKDIR_P@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
+XGETTEXT=@XGETTEXT@
+MSGCAT=@MSGCAT@
 
 #---[ Paths ]----------------------------------------------------------------------------
 
@@ -60,6 +62,8 @@ sysconfdir=@sysconfdir@
 
 BASEDIR=@BASEDIR@
 
+POTDIR=$(BASEDIR)/.pot
+
 OBJDIR=$(BASEDIR)/.obj/@DLLPREFIX@$(LIBNAME)
 OBJDBG=$(OBJDIR)/Debug
 OBJRLS=$(OBJDIR)/Release
@@ -117,6 +121,22 @@ $(OBJRLS)/%.o: \
 		-DDATADIR=$(datarootdir)/pw3270 \
 		-o $@ -c $<
 
+#---[ Misc Rules ]-----------------------------------------------------------------------
+
+$(POTDIR)/%.pot: \
+	%.c
+
+	@echo $(notdir $@) ...
+	@$(MKDIR) `dirname $@`
+	@$(XGETTEXT) \
+		--language=C \
+		--keyword=_ \
+		--keyword=N_ \
+		--keyword=MSG_:2 \
+		--output=$@ \
+		$<
+	@touch $@
+
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
@@ -165,14 +185,22 @@ $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c: \
 	$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ $(wildcard src/mkfb/*.c)
 	$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@
 
+lib$(LIBNAME).pot: \
+	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
+
+	@rm -f $@
+	@mkdir -p `dirname $@`
+	@$(MSGCAT) --sort-output $^ > $@
+
+locale: \
+	lib$(LIBNAME).pot
+
+
 #---[ Install Targets ]------------------------------------------------------------------
 
 
 #---[ Debug Targets ]--------------------------------------------------------------------
 
-x: \
-	$(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c
-
 Debug: \
 	$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@
 
@@ -222,6 +250,8 @@ cleanRelease:
 
 	@rm -fr $(OBJRLS)
 	@rm -fr $(BINRLS)
+	@rm -fr $(POTDIR)
+	@rm -f lib$(LIBNAME).pot
 
 clean: \
 	cleanDebug \
diff --git a/src/include/config.h.in b/src/include/config.h.in
index ff99173..fb2b1c8 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -54,7 +54,7 @@
 	/* Windows Options */
 #ifdef WIN32
 	#undef HAVE_WIN_REGISTRY
-#endif WIN32
+#endif // WIN32
 
 	/* Optional parts. */
 	#undef X3270_DBCS
--
libgit2 0.21.2