diff --git a/win/pack.sh b/win/pack.sh
index 9e1be30..b82df44 100755
--- a/win/pack.sh
+++ b/win/pack.sh
@@ -395,7 +395,7 @@ makeInstaller()
 		NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
 
 		mkdir -p ${WORKDIR}/build/${ARCH}/sslcerts
-		cp -rv ${CERTS_DIR} ${WORKDIR}/build/${ARCH}/sslcerts
+		cp -rv ${CERTS_DIR}/* ${WORKDIR}/build/${ARCH}/sslcerts
 		if [ "$?" != "0" ]; then
 			failed "Can't copy certs"
 		fi
@@ -434,6 +434,8 @@ makeInstaller()
 			if [ "$?" != "0" ]; then
 				echo makensis ${NSIS_ARGS} ${NSI}
 				failed "Error building ${NSI}"
+				cd ${WORKDIR}/build/${ARCH}
+				/bin/bash
 			fi
 
 			echo "TARCH="[${TARCH}]" ARCH=[${ARCH}]"
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 80e2ae8..32cad4d 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -79,8 +79,8 @@ SubSection "@PACKAGE@" SecMain
 		file "/oname=$INSTDIR\@PACKAGE@.dll"				"@PACKAGE@.dll"
 
 		# Configuration files
-		file "/oname=$INSTDIR\@PACKAGE@-logo.png"			"@PRODUCT_NAME@\@PACKAGE@-logo.png"
-		file "/oname=$INSTDIR\@PACKAGE@.png"				"@PRODUCT_NAME@\@PACKAGE@.png"
+		file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png"			"@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
+		file "/oname=$INSTDIR\@PRODUCT_NAME@.png"			"@PRODUCT_NAME@\@PRODUCT_NAME@.png"
 		file "/oname=$INSTDIR\colors.conf"				"@PRODUCT_NAME@\colors.conf"
 
 		# Documentation files
@@ -96,7 +96,7 @@ SubSection "@PACKAGE@" SecMain
 		file "/oname=$INSTDIR\ui\00default.xml" 	"@PRODUCT_NAME@\ui\00default.xml"
 
 		# Charset definition files
-		CreateDirectory "$INSTDIR\charsets"
+		CreateDirectory "$INSTDIR\remap"
 		file "/oname=$INSTDIR\remap\bracket.xml" 	"@PRODUCT_NAME@\remap\bracket.xml"
 
 		# Locale files
--
libgit2 0.21.2