diff --git a/configure.ac b/configure.ac
index 21cdeae..da9e67d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,10 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product 
 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
 AC_SUBST(PRODUCT_NAME,$app_cv_product)
 
+AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol library name])], [ app_cv_library="$withval" ],[ app_cv_library=`pkg-config --variable=library_name lib3270` ])
+AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library)
+AC_SUBST(LIBRARY_NAME,$app_cv_library)
+
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
 dnl ---------------------------------------------------------------------------
diff --git a/win/pack.sh b/win/pack.sh
index 82c16d2..2623f65 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -165,7 +165,7 @@ buildLibrary()
 
 			host="${host}" \
 			prefix="${prefix}" \
-			BUILDDIR="${WORKDIR}/build/${ARCH}}" \
+			BUILDDIR="${WORKDIR}/build/${ARCH}" \
 			CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
 			LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
 				${PROJECTDIR}/win/configure.${1}
@@ -290,8 +290,7 @@ buildApplication()
 				--includedir=${WORKDIR}/build/${ARCH}/include \
 				--sysconfdir=${WORKDIR}/build/${ARCH} \
 				--datadir=${WORKDIR}/build/${ARCH} \
-				--datarootdir=${WORKDIR}/build/${ARCH} \
-				--with-application-datadir=${WORKDIR}/build/${ARCH}
+				--datarootdir=${WORKDIR}/build/${ARCH}
 
 		fi
 
@@ -391,14 +390,23 @@ makeInstaller()
 {
 	NSIS_ARGS="-DWITHGTK"
 
-	if [ -d ${WORKDIR}/build/${ARCH}/certs ]; then
+	if [ -d ${WORKDIR}/certs ]; then
 		NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
 
-		SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/certs c_rehash
+		export SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/sslcerts
+
+		mkdir -p ${SSL_CERT_DIR}
+		cp -rv ${WORKDIR}/certs ${SSL_CERT_DIR}
+		if [ "$?" != "0" ]; then
+			failed "Can't copy certs"
+		fi
+
+		c_rehash
 		if [ "$?" != "0" ]; then
-			failed "Error on c_rehash"
+			failed "Can't hash certs"
 		fi
 
+
 	fi
 
 	if [ ! -z "${PACKAGE_PLUGINS}" ]; then
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 204b525..bfcfd98 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain
 		# Binary files
 		file "/oname=$INSTDIR\@PRODUCT_NAME@.exe"			"@PACKAGE@.exe"
 		file "/oname=$INSTDIR\@PRODUCT_NAME@.ico"			"@PACKAGE@.ico"
-		file "/oname=$INSTDIR\lib3270.dll"				"lib3270.dll"
+		file "/oname=$INSTDIR\@LIBRARY_NAME@.dll"			"@LIBRARY_NAME@.dll"
 		file "/oname=$INSTDIR\libv3270.dll"				"libv3270.dll"
 		file "/oname=$INSTDIR\@PACKAGE@.dll"				"@PACKAGE@.dll"
 
@@ -134,6 +134,13 @@ SubSection "@PACKAGE@" SecMain
 
 	sectionEnd
 
+!ifdef WITHCERTS
+	Section "SSL Certificates" SecCerts
+		setOutPath $INSTDIR\certs
+		file /r "certs\*.*"
+	sectionEnd
+!endif
+
 !ifdef WITHPLUGINS
 	SubSection "Plugins" SecPLugin
 
--
libgit2 0.21.2