diff --git a/Makefile.in b/Makefile.in
index a0b9897..cdcbe29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,8 +254,8 @@ locale: \
 
 locale/$(PACKAGE_TARNAME).pot: \
 	$(POTDIR)/pw3270.pot \
-	/usr/share/@PRODUCT_NAME@/pot/lib3270.pot \
-	/usr/share/@PRODUCT_NAME@/pot/libv3270.pot \
+	$(datarootdir)/$(PRODUCT_NAME)/pot/lib3270.pot \
+	$(datarootdir)/$(PRODUCT_NAME)/pot/libv3270.pot \
 	$(POTDIR)/ui.pot
 
 	@rm -f $@
diff --git a/win/pack.sh b/win/pack.sh
index 5b1bfeb..cdd3ccc 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270"
 LIBRARY_NAME="lib3270"
 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
 PACKAGE_PLUGINS=""
-PACKAGE_EXTRAS="libhllapi"
+PACKAGE_EXTRAS="libhllapi tn3270-mono"
 TARGET_ARCHS="x86_64 x86_32"
 GIT_URL="https://github.com/PerryWerneck"
 
@@ -78,11 +78,13 @@ prepare()
 	mkdir -p ${WORKDIR}/sources
 
 	TEMPVAR=${1}_branch
-	BRANCH=${!TEMPVAR}
+	BRANCH=${!TEMPVAR} 2> /dev/null
 
 	if [ -z ${BRANCH} ]; then
 		git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
 	else
+		echo "Preparing ${1} ${BRANCH}"
+		echo -e "\e]2;Preparing ${1} ${BRANCH}\a"
 		git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
 	fi
 
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index d8972f7..0397dec 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -287,7 +287,7 @@ Section "Uninstall"
 	delete $SYSDIR\hllapi.dll
 !endif
 
-!ifdef WITHMONO
+!ifdef WITHMONO-TN3270
 	delete $SYSDIR\mono-tn3270.dll
 !endif
 
@@ -299,7 +299,7 @@ Function .onInit
 
 	#---[ Check DOTNET Command line option ]0-------------------------------------------------------------
 
-!ifdef WITHMONO
+!ifdef WITHMONO-TN3270
 	Push $0
 
 	${GetParameters} $R0
--
libgit2 0.21.2