4 files changed, 14 insertions, 10 deletions
diff --git a/Master/bin/win32/dviout.bat b/Master/bin/win32/dviout.bat
index 1b9d2cdb3f7..b3eaa6cfb0f 100755
--- a/Master/bin/win32/dviout.bat
+++ b/Master/bin/win32/dviout.bat
@@ -17,7 +17,7 @@ path %tlroot%\bin\win32;%path%
 
 rem Ask kpsewhich for TEXMFVAR
 for /f "delims=" %%I in (
-  'kpsewhich --expand-var "$TEXMFVAR/fonts"'
+  '%~sdp0kpsewhich.exe --expand-var "$TEXMFVAR/fonts"'
 ) do (
   set fontsdir=%%~fI
 )
@@ -26,7 +26,7 @@ if not exist "%fontsdir%\" goto :no_fontsdir
 
 rem Ask kpsewhich for TFM search path
 for /f "delims=" %%I in (
-  'kpsewhich --show-path tfm'
+  '%~sdp0kpsewhich.exe --show-path tfm'
 ) do (
   set tfmpath=%%I
 )
diff --git a/Master/bin/win32/psv.bat b/Master/bin/win32/psv.bat
index e58f142ddb9..bdb8ca571bf 100755
--- a/Master/bin/win32/psv.bat
+++ b/Master/bin/win32/psv.bat
@@ -1,5 +1,8 @@
 @echo off
-rem Launcher script for PSV
+rem Start-up script for PS_View
+rem
+rem Originally written 2009 by Tomasz M. Trzeciak
+rem Public Domain
 
 rem Make environment changes local
 setlocal enableextensions
@@ -12,4 +15,4 @@ set GS_DLL=%tlroot%\tlpkg\tlgs\bin\gsdll32.dll
 rem Add bin dir to path
 path %tlroot%\bin\win32;%path%
 rem Start PSV and exit
-start "" "%tlroot%\tlpkg\tlpsv\gswxlua.exe" -l psv.wx.lua -p psv_view.ps -sINPUT=%1 %2
+start "" "%tlroot%\tlpkg\tlpsv\gswxlua.exe" -l "%tlroot%\tlpkg\tlpsv\psv.wx.lua" -p "%tlroot%\tlpkg\tlpsv\psv_view.ps" -sINPUT=%1 %2
diff --git a/Master/bin/win32/texworks.bat b/Master/bin/win32/texworks.bat
index f9e8b227e10..c5ca9740674 100755
--- a/Master/bin/win32/texworks.bat
+++ b/Master/bin/win32/texworks.bat
@@ -1,16 +1,17 @@
 @echo off
 rem Start-up script for TeXworks
 rem
-rem Copyright 2009 by Tomasz M. Trzeciak
+rem Originally written 2009 by Tomasz M. Trzeciak
 rem Public Domain
 
 setlocal enableextensions
-rem Get installation root (should be two levels up)
-for %%I in ("%~dp0..\..") do (set TEXROOT=%%~fI)
+rem Get TL installation root (w/o trailing backslash)
+set TEXROOT=%~dp0:
+set TEXROOT=%TEXROOT:\bin\win32\:=%
 rem Add bin dir to path
 path %TEXROOT%\bin\win32;%PATH%
 rem Ask kpsewhich about TEXMFCONFIG location
-for /f "delims=" %%I in ('kpsewhich --var-value=TEXMFCONFIG') do (
+for /f "delims=" %%I in ('%~sdp0kpsewhich.exe --var-value=TEXMFCONFIG') do (
   set TW_INIPATH=%%~fI\texworks
   set TW_LIBPATH=%%~fI\texworks
 )
diff --git a/Master/bin/win32/tlmgr.bat b/Master/bin/win32/tlmgr.bat
index 193d1b81d92..bd416e03817 100755
--- a/Master/bin/win32/tlmgr.bat
+++ b/Master/bin/win32/tlmgr.bat
@@ -18,8 +18,8 @@ if exist "%tlupdater%" goto :err_updater_exists
 
 rem Start tlmgr
 set PERL5LIB=%tlroot%\tlpkg\tlperl\lib
-path %tlroot%\tlpkg\tlperl\bin;%tlroot%\bin\win32;%path%
-perl "%tlroot%\texmf\scripts\texlive\tlmgr.pl" %*
+path %tlroot%\bin\win32;%path%
+"%tlroot%\tlpkg\tlperl\bin\perl.exe" "%tlroot%\texmf\scripts\texlive\tlmgr.pl" %*
 
 rem Finish if there are no updates to do; the last error code will be returned
 if not exist "%tlupdater%" goto :eof