diff --git a/Makefile.in b/Makefile.in
index 18d20fd..c695bf9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,7 +45,6 @@ localedir=${datarootdir}/locale
 docdir=@docdir@
 sysconfdir=@sysconfdir@
 mandir=@mandir@
-APPDATADIR=@APPDATADIR@
 
 BASEDIR=@BASEDIR@
 
@@ -175,7 +174,7 @@ $(POTDIR)/%.pot: \
 	@$(MAKE) -C src/$(basename $(notdir $@)) $@
 
 $(POTDIR)/%.pot: \
-	$(APPDATADIR)/pot/%.pot
+	$(datarootdir)/$(PRODUCT_NAME)/pot/%.pot
  
 	@echo $(notdir $@) ...
 	@mkdir -p `dirname $@`
diff --git a/branding/Makefile.in b/branding/Makefile.in
index eeab62f..fddca85 100644
--- a/branding/Makefile.in
+++ b/branding/Makefile.in
@@ -27,11 +27,11 @@
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
+PRODUCT_NAME=@PRODUCT_NAME@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
-APPDATADIR=@APPDATADIR@
 
 BASEDIR=@BASEDIR@
 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding
@@ -73,7 +73,7 @@ $(BINDIR)/%.png: \
 	@$(MKDIR) `dirname $@`
 	@$(OPTIPNG) -out $@ -o7 $<
 
-$(DESTDIR)$(APPDATADIR)/%.png: \
+$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.png: \
 	$(BINDIR)/%.png
 
 	@echo $@ ...
@@ -88,9 +88,9 @@ $(DESTDIR)$(datarootdir)/pixmaps/%.png: \
 	@$(INSTALL_DATA) $< $@
 
 install: \
-	$(DESTDIR)$(APPDATADIR)/$(PACKAGE_NAME).png \
+	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).png \
 	$(DESTDIR)$(datarootdir)/pixmaps/$(PACKAGE_TARNAME).png \
-	$(DESTDIR)$(APPDATADIR)/$(PACKAGE_NAME)-logo.png
+	$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME)-logo.png
 
 	@$(INSTALL_DATA) \
 		launcher.desktop \
diff --git a/configure.ac b/configure.ac
index 1e7372d..21cdeae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,16 +103,6 @@ AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
 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_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)
-AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
-
-AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
-AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
-
 AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
 AC_SUBST(PRODUCT_NAME,$app_cv_product)
diff --git a/locale/Makefile.in b/locale/Makefile.in
index 44e6e0c..1c0cbf0 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -31,11 +31,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 localedir=${datarootdir}/locale
-APPDATADIR=@APPDATADIR@
 
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
+PRODUCT_NAME=@PRODUCT_NAME@
 
 BASEDIR=@BASEDIR@
 BINDIR=$(BASEDIR)/.bin/locale
@@ -78,9 +78,9 @@ all: \
 install: \
 	$(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
 
-	@$(MKDIR) $(DESTDIR)$(APPDATADIR)/locale
-	@$(INSTALL_DATA) *.po $(DESTDIR)$(APPDATADIR)/locale
-	@$(INSTALL_DATA) $(PACKAGE_NAME).pot $(DESTDIR)$(APPDATADIR)/locale
-	@$(INSTALL_DATA) Makefile $(DESTDIR)$(APPDATADIR)/locale
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
+	@$(INSTALL_DATA) *.po $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
+	@$(INSTALL_DATA) $(PACKAGE_NAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
+	@$(INSTALL_DATA) Makefile $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
 
 
diff --git a/locale/pw3270.pot b/locale/pw3270.pot
index 1639af8..e101f19 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-06 10:59-0300\n"
+"POT-Creation-Date: 2019-09-06 15:13-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"
diff --git a/ui/Makefile.in b/ui/Makefile.in
index f1b66cf..73be93d 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -32,11 +32,11 @@ SOURCES=xml2pot.c
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
-APPDATADIR=@APPDATADIR@
 
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
+PRODUCT_NAME=@PRODUCT_NAME@
 
 BASEDIR=@BASEDIR@
 POTDIR=$(BASEDIR)/.pot/ui
@@ -104,8 +104,8 @@ Release: \
 
 install:
 
-	@$(MKDIR) $(DESTDIR)$(APPDATADIR)/ui
-	@$(INSTALL_DATA) *.xml $(DESTDIR)$(APPDATADIR)/ui
+	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/ui
+	@$(INSTALL_DATA) *.xml $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/ui
 
 $(SRCDIR): \
 	clean
diff --git a/win/pack.sh b/win/pack.sh
index 5f96840..82c16d2 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -302,6 +302,7 @@ buildApplication()
 
 		make all
 		if [ "$?" != "0" ]; then
+			/bin/bash
 			failed "Can't buid ${1}"
 		fi
 
@@ -390,6 +391,16 @@ makeInstaller()
 {
 	NSIS_ARGS="-DWITHGTK"
 
+	if [ -d ${WORKDIR}/build/${ARCH}/certs ]; then
+		NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
+
+		SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/certs c_rehash
+		if [ "$?" != "0" ]; then
+			failed "Error on c_rehash"
+		fi
+
+	fi
+
 	if [ ! -z "${PACKAGE_PLUGINS}" ]; then
 		NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS"
 	fi
@@ -506,6 +517,10 @@ do
 			PRODUCT_NAME=${value}
 			;;
 
+		SOURCES-FROM)
+			GIT_URL=${value}
+			;;
+
 		ADD-REPOS)
 			addRepos
 			exit 0
@@ -518,6 +533,10 @@ do
 
 			;;
 
+		TARGET-ARCHS)
+			TARGET_ARCHS=${value}
+			;;
+
 		PROJECT-PATH)
 			PROJECTDIR=$(readlink -f ${value})
 			;;
@@ -531,6 +550,7 @@ do
 
 			echo "  --product-name	Set the product name (current is ${PRODUCT_NAME})"
 			echo "  --project-path	Set the path for the customization data"
+			echo "  --target-archs	Set the target architectures (current are ${TARGET_ARCHS})"
 
 			if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
 				echo "  --no-publish		Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
@@ -539,7 +559,7 @@ do
 
 
 			if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
-				echo "  --clear		Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
+				echo "  --clear		Replace the contents of ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
 			fi
 
 			echo ""
--
libgit2 0.21.2