diff --git a/scripts/modify-path.cmd b/scripts/modify-path.cmd
index 28bcbcd..efcd7ce 100644
--- a/scripts/modify-path.cmd
+++ b/scripts/modify-path.cmd
@@ -7,6 +7,7 @@ set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^
 %LOCALAPPDATA%\Microsoft\WindowsApps;^
 %TOOLS%;^
 %TOOLS%\android;^
+%TOOLS%\sysinternals;^
 %TOOLS%\git\bin;^
 %TOOLS%\git\cmd;^
 %TOOLS%\git\usr\bin;^
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index 5cc7a44..af8eee5 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -13,8 +13,7 @@ rem ###################################
 
 for %%A in (
 
-  bginfo
-  autoruns
+  cmail
   curl
   imapcopy
   installwimtweak
@@ -28,7 +27,6 @@ for %%A in (
   vivetool
   winscp
   wub
-  cmail
 
 ) do (
   
@@ -47,16 +45,9 @@ echo move files to tools folder
 echo ###################################
 echo.
 
-echo BGinfo ...
-mkdir %TOOLS%\bginfo 2>nul
-move /Y %T%\bginfo\Bginfo64.exe %TOOLS%\bginfo
-copy /Y config\config.bgi %TOOLS%\bginfo
-rd /S /Q %T%\bginfo 2>nul
-echo.
-
-echo Autoruns ...
-move /Y %T%\autoruns\autoruns.exe %TOOLS%
-rd /S /Q %T%\autoruns 2>nul
+echo CMail - a Windows mailer
+move /Y %T%\cmail\cmail.exe %TOOLS%
+rd /S /Q %T%\cmail
 echo.
 
 echo CURL
@@ -133,12 +124,10 @@ move /Y %T%\wub\wub_x64.exe %TOOLS%\wub.exe
 rd /S /Q %T%\wub
 echo.
 
-echo CMail - a Windows mailer
-move /Y %T%\cmail\cmail.exe %TOOLS%
-rd /S /Q %T%\cmail
-echo.
+echo +++++++++++++++++++++++
+echo ++++ Android tools ++++
+echo +++++++++++++++++++++++
 
-echo Android tools ...
 if NOT EXIST %SOFTWARE%\android.zip (
   echo WARNING: %SOFTWARE%\android.zip not found!
 ) else (
@@ -149,5 +138,26 @@ if NOT EXIST %SOFTWARE%\android.zip (
 )
 echo.
 
+echo ++++++++++++++++++++++
+echo ++++ Sysinternals ++++
+echo ++++++++++++++++++++++
+
+if NOT EXIST %SOFTWARE%\sysinternals.zip (
+  echo WARNING: %SOFTWARE%\sysinternals.zip not found!
+) else (
+  echo unpacking sysinternals.zip ...
+  mkdir %TOOLS%\sysinternals 2>nul
+  %TOOLS%\7z e -y -aoa -o%TOOLS%\sysinternals %SOFTWARE%\sysinternals.zip 1>nul
+
+  echo put autoruns in place ...
+  move /Y %TOOLS%\sysinternals\autoruns.exe %TOOLS%
+
+  echo put bginfo in place ...
+  mkdir %TOOLS%\bginfo 2>nul
+  copy /Y config\config.bgi %TOOLS%\bginfo
+  move /Y %TOOLS%\sysinternals\Bginfo64.exe %TOOLS%\bginfo
+)
+echo.
+
 echo ####### %0 #######
 
diff --git a/software/basic.csv b/software/basic.csv
index e2b4951..9a84449 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -1,7 +1,6 @@
 https://www.7-zip.org/a/7z1900-x64.msi 7z-setup.msi
 https://go.microsoft.com/fwlink/?linkid=2120254 adk-setup.exe
-https://download.sysinternals.com/files/BGInfo.zip bginfo.zip
-https://download.sysinternals.com/files/Autoruns.zip autoruns.zip
+https://download.sysinternals.com/files/SysinternalsSuite.zip sysinternals.zip
 https://curl.se/windows/dl-7.79.1/curl-7.79.1-win64-mingw.zip curl.zip
 https://github.com/git-for-windows/git/releases/download/v2.30.1.windows.1/Git-2.30.1-64-bit.exe git-setup.exe
 http://www.ardiehl.de/imapcopy/IMAPCopy.zip imapcopy.zip