diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index b9335a67..4e06065c 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -1,4 +1,4 @@
-PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86
+PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86
 
 set VC_VERSION=1.26.20
 set VC_VERSION_NBRE=1.26.20
@@ -43,15 +43,15 @@ endlocal
 @echo on
 
 del Languages.zip
-7z a -y Languages.zip Languages
+tar -a -cf Languages.zip Languages
 rmdir /S /Q docs
-mkdir docs\html\en
+mkdir docs\html
 mkdir docs\EFI-DCS
-xcopy /E /V /Y ..\..\..\doc\html\* docs\html\en\.
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
+xcopy /E /V /Y ..\..\..\doc\html\* docs\html\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide*.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
 del docs.zip
-7z a -y docs.zip docs
+tar -a -cf docs.zip docs
 "VeraCrypt Setup.exe" /p
 "VeraCrypt Portable.exe" /p
 VeraCryptCOMRegBase.exe /p
@@ -69,7 +69,7 @@ del VeraCrypt.ico
 del VeraCrypt_setup_background.bmp
 del VeraCrypt_setup.bmp
 del Setup.ico
-del "VeraCrypt User Guide.chm"
+del "VeraCrypt User Guide*.chm"
 del Languages.zip
 del docs.zip
 rmdir /S /Q Languages
diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat
index 8b45ce32..45535a35 100644
--- a/src/Signing/sign_TESTSIGNING.bat
+++ b/src/Signing/sign_TESTSIGNING.bat
@@ -1,4 +1,4 @@
-PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
+PATH=%PATH%;%WSDK81%\bin\x86
 
 set VC_VERSION=1.26.20
 set VC_VERSION_NBRE=1.26.20
@@ -25,15 +25,15 @@ rmdir /S /Q Languages
 mkdir Languages
 copy /V /Y ..\..\..\Translations\*.xml Languages\.
 del Languages.zip
-7z a -y Languages.zip Languages
+tar -a -cf Languages.zip Languages
 rmdir /S /Q docs
 mkdir docs\html\en
 mkdir docs\EFI-DCS
-copy /V /Y ..\..\..\doc\html\* docs\html\en\.
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
+xcopy /E /V /Y ..\..\..\doc\html\* docs\html\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide*.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
 del docs.zip
-7z a -y docs.zip docs
+tar -a -cf docs.zip docs
 "VeraCrypt Setup.exe" /p
 "VeraCrypt Portable.exe" /p
 
@@ -45,7 +45,7 @@ del VeraCrypt.ico
 del VeraCrypt_setup_background.bmp
 del VeraCrypt_setup.bmp
 del Setup.ico
-del "VeraCrypt User Guide.chm"
+del "VeraCrypt User Guide*.chm"
 del Languages.zip
 del docs.zip
 rmdir /S /Q Languages
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index 4af038a4..217cb5b2 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -1,4 +1,4 @@
-PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
+PATH=%PATH%;%WSDK81%\bin\x86
 set VC_VERSION=1.26.20
 set VC_VERSION_NBRE=1.26.20
 set PFXNAME=TestCertificate\idrix_codeSign.pfx
@@ -38,15 +38,15 @@ rmdir /S /Q Languages
 mkdir Languages
 copy /V /Y ..\..\..\Translations\*.xml Languages\.
 del Languages.zip
-7z a -y Languages.zip Languages
+tar -a -cf Languages.zip Languages
 rmdir /S /Q docs
 mkdir docs\html\en
 mkdir docs\EFI-DCS
-xcopy /E /V /Y ..\..\..\doc\html\* docs\html\en\.
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
+xcopy /E /V /Y ..\..\..\doc\html\* docs\html\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide*.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
 del docs.zip
-7z a -y docs.zip docs
+tar -a -cf docs.zip docs
 "VeraCrypt Setup.exe" /p
 call build_msi_x64.bat %VC_VERSION_NBRE%
 del LICENSE
diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat
index bdf3cc31..2031f293 100644
--- a/src/Signing/sign_test_debug.bat
+++ b/src/Signing/sign_test_debug.bat
@@ -1,4 +1,4 @@
-PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
+PATH=%PATH%;%WSDK81%\bin\x86
 set VC_VERSION=1.26.20
 set VC_VERSION_NBRE=1.26.20
 set PFXNAME=TestCertificate\idrix_codeSign.pfx
@@ -34,17 +34,17 @@ rmdir /S /Q Languages
 mkdir Languages
 copy /V /Y ..\..\..\Translations\*.xml Languages\.
 del Languages.zip
-7z a -y Languages.zip Languages
+tar -a -cf Languages.zip Languages
 rmdir /S /Q docs
 mkdir docs\html\en
 mkdir docs\EFI-DCS
-copy /V /Y ..\..\..\doc\html\* docs\html\en\.
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
+xcopy /E /V /Y ..\..\..\doc\html\* docs\html\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide*.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
 copy "..\..\Release\Setup Files\*.cat" .
 copy "..\..\Release\Setup Files\veracrypt.inf" .
 del docs.zip
-7z a -y docs.zip docs
+tar -a -cf docs.zip docs
 "VeraCrypt Setup.exe" /p
 call build_msi_x64.bat %VC_VERSION_NBRE%
 del LICENSE
@@ -55,7 +55,7 @@ del VeraCrypt.ico
 del VeraCrypt_setup_background.bmp
 del VeraCrypt_setup.bmp
 del Setup.ico
-del "VeraCrypt User Guide.chm"
+del "VeraCrypt User Guide*.chm"
 del Languages.zip
 del docs.zip
 rmdir /S /Q Languages