diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
index d7f156311..336ca9541 100644
--- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh
+++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh
@@ -36,7 +36,11 @@ SectionGroup "Plugins" Plugins
 		Delete "$PLUGIN_INST_PATH\NppExport\NppExport.dll"
 		
 		SetOutPath "$PLUGIN_INST_PATH\NppExport"
+!ifdef ARCH64
+		File "..\bin64\plugins\NppExport\NppExport.dll"
+!else
 		File "..\bin\plugins\NppExport\NppExport.dll"
+!endif
 	${MementoSectionEnd}
 
 !endif
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index 93584d810..a1dad976c 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -50,6 +50,7 @@ signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://not
 If ErrorLevel 1 goto End
 
 signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\plugins\NppExport\NppExport.dll
+signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\NppExport\NppExport.dll
 If ErrorLevel 1 goto End
 signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\plugins\mimeTools\mimeTools.dll
 signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\mimeTools\mimeTools.dll
@@ -147,6 +148,7 @@ mkdir .\zipped.package.release64\themes
 mkdir .\zipped.package.release64\autoCompletion
 mkdir .\zipped.package.release64\userDefineLangs
 mkdir .\zipped.package.release64\plugins
+mkdir .\zipped.package.release64\plugins\NppExport
 mkdir .\zipped.package.release64\plugins\mimeTools
 mkdir .\zipped.package.release64\plugins\NppConverter
 mkdir .\zipped.package.release64\plugins\Config
@@ -211,6 +213,8 @@ copy /Y "..\bin\plugins\NppConverter\NppConverter.dll" .\zipped.package.release\
 If ErrorLevel 1 goto End
 
 rem Plugins: Copy needed files into Notepad++ 64-bit package folders
+copy /Y "..\bin\plugins\NppExport\NppExport.dll" .\zipped.package.release64\plugins\NppExport\
+If ErrorLevel 1 goto End
 copy /Y "..\bin64\plugins\mimeTools\mimeTools.dll" .\zipped.package.release64\plugins\mimeTools\
 If ErrorLevel 1 goto End
 copy /Y "..\bin64\plugins\NppConverter\NppConverter.dll" .\zipped.package.release64\plugins\NppConverter\