diff --git a/msys2/msys2_shell.cmd b/msys2/msys2_shell.cmd
index 79c054e7d..b949e1777 100644
--- a/msys2/msys2_shell.cmd
+++ b/msys2/msys2_shell.cmd
@@ -16,14 +16,14 @@ rem or uncomment next line
 rem set MSYS2_PATH_TYPE=inherit
 
 
-SET PATH=%PATH%;%MYPATH%msys2\usr\bin
+SET PATH=%PATH%;%WD%
 rem /tmp is required for bash to work
-mkdir %MYPATH%msys2\tmp
-del %MYPATH%msys2\etc\passwd 
-del %MYPATH%msys2\etc\group 
-%MYPATH%msys2\usr\bin\touch /etc/passwd
-%MYPATH%msys2\usr\bin\touch /etc/group
-%MYPATH%msys2\usr\bin\bash /user_setup.sh
+mkdir %WD%..\..\tmp 2> nul
+del %WD%..\..\etc\passwd 2> nul
+del %WD%..\..\etc\group 2> nul
+%WD%touch /etc/passwd
+%WD%touch /etc/group
+%WD%bash /user_setup.sh
 
 :checkparams
 rem Help option
diff --git a/runme.bat b/runme.bat
index 7ac605bdb..bbbbfff10 100644
--- a/runme.bat
+++ b/runme.bat
@@ -10,4 +10,4 @@ echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>msys2/etc/fstab
 echo none / cygdrive binary,posix=0,noacl,user 0 0 >>msys2/etc/fstab
 echo %MYPATH%pm3 /pm3 ntfs noacl 0 0 >>msys2/etc/fstab
 echo %MYPATH%gcc-arm-none-eabi /gcc-arm-none-eabi ntfs noacl 0 0 >>msys2/etc/fstab
-msys2\msys2_shell.cmd -mingw32 -defterm
\ No newline at end of file
+msys2\msys2_shell.cmd -mingw32 -defterm -no-start
\ No newline at end of file
diff --git a/runme64.bat b/runme64.bat
index 701ad5ea1..a7a12095e 100644
--- a/runme64.bat
+++ b/runme64.bat
@@ -10,4 +10,4 @@ echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>msys2/etc/fstab
 echo none / cygdrive binary,posix=0,noacl,user 0 0 >>msys2/etc/fstab
 echo %MYPATH%pm3 /pm3 ntfs noacl 0 0 >>msys2/etc/fstab
 echo %MYPATH%gcc-arm-none-eabi /gcc-arm-none-eabi ntfs noacl 0 0 >>msys2/etc/fstab
-msys2\msys2_shell.cmd -mingw64 -defterm
\ No newline at end of file
+msys2\msys2_shell.cmd -mingw64 -defterm -no-start
\ No newline at end of file