diff --git a/configure.ac b/configure.ac
index e8b118c..66640ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,13 +159,16 @@ case "$host" in
 		if test "$host_cpu" = "x86_64"; then
 			app_cv_programfiles="PROGRAMFILES64"
 			app_cv_winarch="64"
+			app_cv_nsisredir="DisableX64FSRedirection"
 		else
 			app_cv_programfiles="PROGRAMFILES"
 			app_cv_winarch="32"
+			app_cv_nsisredir="EnableX64FSRedirection"
 		fi
 
 		AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
 		AC_SUBST(WINARCH,$app_cv_winarch)
+		AC_SUBST(NSISREDIR,$app_cv_nsisredir)
 		AC_SUBST(LIBEXT,.dll)
 		;;
 
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index 7e5e670..ced6f52 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -80,7 +80,6 @@ SubSection "@PRODUCT_NAME@" SecMain
 		file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll"			"lib@LIBRARY_NAME@.dll"
 		file "/oname=$INSTDIR\libv3270.dll"				"libv3270.dll"
 		file "/oname=$INSTDIR\@PACKAGE@.dll"				"@PACKAGE@.dll"
-		file "/oname=$SYSDIR\libipc3270.dll"				"libipc3270.dll"
 
 		# Configuration files
 		file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png"			"@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
@@ -150,10 +149,13 @@ SubSection "@PRODUCT_NAME@" SecMain
 			setOutPath $INSTDIR
 
 			${DisableX64FSRedirection}
-			CreateDirectory "$INSTDIR\plugins"
 
+			CreateDirectory "$INSTDIR\plugins"
 			file "/oname=$INSTDIR\plugins\ipcserver.dll"	"@PRODUCT_NAME@-plugins\ipcserver.dll"
 
+			${@NSISREDIR@}
+			file "/oname=$SYSDIR\libipc3270.dll"		"libipc3270.dll"
+
 		sectionEnd
 
 	SubSectionEnd
@@ -164,7 +166,9 @@ SubSection "@PRODUCT_NAME@" SecMain
 !ifdef WITHLIBHLLAPI
 		Section /o "HLLAPI" HLLAPIBinding
 
-			${DisableX64FSRedirection}
+			${@NSISREDIR@}
+
+			# Install HLLAPI connector
 			file "/oname=$SYSDIR\hllapi.dll"		"libhllapi.dll"
 
 			# Install with "lib" prefix for compatibility.
@@ -176,11 +180,13 @@ SubSection "@PRODUCT_NAME@" SecMain
 !ifdef WITHMONO-TN3270
 		Section /o ".NET" DOTNET
 
-			${DisableX64FSRedirection}
 			CreateDirectory "$INSTDIR\dotnet"
 
+			${DisableX64FSRedirection}
 			file "/oname=$INSTDIR\dotnet\tn3270.dll"	"mono/lib/tn3270-5.2/tn3270.dll"
 			file "/oname=$INSTDIR\dotnet\tn3270.xml"	"mono/gapi-2.0/tn3270/tn3270.xml"
+
+			${@NSISREDIR@}
 			file "/oname=$SYSDIR\mono-tn3270.dll"		"mono-tn3270.dll"
 
 		SectionEnd
@@ -290,6 +296,8 @@ Section "Uninstall"
 	SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 
 	# Delete System libraries
+	${@NSISREDIR@}
+
 	delete $SYSDIR\libipc3270.dll
 
 !ifdef WITHHLLAPI
--
libgit2 0.21.2