diff --git a/Makefile.in b/Makefile.in
index 51232fc..e89d242 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -208,7 +208,7 @@ nsi: Release
 ifneq ($(MAKENSIS),no)
 	@chmod +x makegtkruntime.sh
 	@./makegtkruntime.sh
-	@$(MAKENSIS) $(PACKAGE_NAME).nsi
+	@"$(MAKENSIS)" $(PACKAGE_NAME).nsi
 endif
 
 $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot
diff --git a/pw3270.nsi.in b/pw3270.nsi.in
index 2a0373b..85c2c19 100644
--- a/pw3270.nsi.in
+++ b/pw3270.nsi.in
@@ -62,8 +62,8 @@ SubSection "@PACKAGE@" SecMain
 		file "/oname=$INSTDIR\@PACKAGE@.ico"	"src\pw3270\@PACKAGE@.ico"
 
 		# Configuration files
-		file "/oname=$INSTDIR\@PACKAGE@-logo.png"	"src/pw3270/@PACKAGE@-logo.png"
-		file "/oname=$INSTDIR\@PACKAGE@.png"		"src/pw3270/@PACKAGE@.png"
+		file "/oname=$INSTDIR\@PACKAGE@-logo.png"	"src\pw3270\@PACKAGE@-logo.png"
+		file "/oname=$INSTDIR\@PACKAGE@.png"		"src\pw3270\@PACKAGE@.png"
 		file "/oname=$INSTDIR\colors.conf"		"colors.conf"
 
 		# Documentation files
@@ -135,6 +135,8 @@ SubSection "@PACKAGE@" SecMain
 #
 	SubSectionEnd
 
+SubSectionEnd
+
 Section /o "GTK+ Runtime" SecGTK
 
 	setOutPath $INSTDIR
--
libgit2 0.21.2