diff --git a/Makefile.in b/Makefile.in
index 4f81067..eb83e97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_LEVEL=@PACKAGE_LEVEL@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@
+PRODUCT_NAME=@PRODUCT_NAME@
 
 #---[ Paths ]------------------------------------------------------------------
 
@@ -45,7 +46,6 @@ docdir=@docdir@
 sysconfdir=@sysconfdir@
 mandir=@mandir@
 APPDATADIR=@APPDATADIR@
-datadir=$(datarootdir)/@PRODUCT_NAME@
 
 BASEDIR=@BASEDIR@
 
@@ -175,11 +175,11 @@ $(POTDIR)/%.pot: \
 	@$(MAKE) -C src/$(basename $(notdir $@)) $@
 
 $(POTDIR)/%.pot: \
-	@LIBRARY_POT_FILES@/%.pot
+	$(datarootdir)/$(PRODUCT_NAME)/pot/%.pot
  
 	@echo $(notdir $@) ...
 	@mkdir -p `dirname $@`
-	@cp "$^" $@
+	@cp "$^" "$@"
 
 $(POTDIR)/%.pot: \
 	./modules/%/* \
diff --git a/configure.ac b/configure.ac
index 3ee962c..1e7372d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,9 +105,6 @@ AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
 
 AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path for lib3270 locale sources])], [ app_cv_source_locales="$withval" ],[ app_cv_source_locales="/usr/share/`pkg-config --variable=product_name lib3270`/pot" ])
 
-AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales)
-AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales)
-
 AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/`pkg-config --variable=product_name lib3270`" ])
 
 AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index dc3aa17..1639af8 100644
--- a/locale/pw3270.pot
+++ b/locale/pw3270.pot
@@ -9,7 +9,7 @@ msgstr ""
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 13:27-0300\n"
+"POT-Creation-Date: 2019-09-06 10:59-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 13:21+0000\n"
+"POT-Creation-Date: 2019-09-05 19:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "#-#-#-#-#  libv3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-05 13:52+0000\n"
+"POT-Creation-Date: 2019-09-05 19:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/win/pack.sh b/win/pack.sh
index 976830e..5f96840 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -494,7 +494,7 @@ do
                 value=${tmp##*=}
 
                 case "$parameter" in
-		NOPUBLISH)
+		NO-NOPUBLISH)
 			PUBLISH=0
 			;;
 
@@ -502,7 +502,7 @@ do
 			PUBLISH=1
 			;;
 
-		PRODUCT)
+		PRODUCT-NAME)
 			PRODUCT_NAME=${value}
 			;;
 
@@ -518,7 +518,7 @@ do
 
 			;;
 
-		PROJECT-DIR)
+		PROJECT-PATH)
 			PROJECTDIR=$(readlink -f ${value})
 			;;
 
@@ -529,14 +529,17 @@ do
 			echo "Options:"
 			echo ""
 
+			echo "  --product-name	Set the product name (current is ${PRODUCT_NAME})"
+			echo "  --project-path	Set the path for the customization data"
+
 			if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
-				echo "  --nopublish	Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
-				echo "  --publish	Publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
+				echo "  --no-publish		Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
+				echo "  --publish		Publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
 			fi
 
 
 			if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
-				echo "  --clear	Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
+				echo "  --clear		Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
 			fi
 
 			echo ""
--
libgit2 0.21.2