3 files changed, 16 insertions, 2 deletions
diff --git a/scripts/context/lua/mtx-update.lua b/scripts/context/lua/mtx-update.lua
index 64203d3e3..a26be483c 100644
--- a/scripts/context/lua/mtx-update.lua
+++ b/scripts/context/lua/mtx-update.lua
@@ -162,6 +162,9 @@ scripts.update.platforms = {
     ["windows"]        = "mswin",
     ["win32"]          = "mswin",
     ["win"]            = "mswin",
+    ["mswin-64"]       = "mswin-64",
+    ["windows-64"]     = "mswin-64",
+    ["win64"]          = "mswin-64",
     ["linux"]          = "linux",
     ["freebsd"]        = "freebsd",
     ["freebsd-amd64"]  = "freebsd-amd64",
diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb
index 77d61b4db..4ca18ee99 100644
--- a/scripts/context/ruby/base/tex.rb
+++ b/scripts/context/ruby/base/tex.rb
@@ -364,8 +364,7 @@ class TEX
     def mpsformats() @@mpsformats.keys.sort end
 
     def defaulttexformats() ['en','nl','mptopdf'] end
-  # def defaultmpsformats() ['metafun']           end # no longer formats
-    def defaultmpsformats() []                    end
+    def defaultmpsformats() ['metafun']           end # no longer formats
 
     def texmakeextras(format) @@texmakestr[format] || '' end
     def mpsmakeextras(format) @@mpsmakestr[format] || '' end
diff --git a/scripts/context/stubs/mswin/setuptex.bat b/scripts/context/stubs/mswin/setuptex.bat
index 52c60f155..5f30bfd4e 100644
--- a/scripts/context/stubs/mswin/setuptex.bat
+++ b/scripts/context/stubs/mswin/setuptex.bat
@@ -8,6 +8,12 @@ if "%SETUPTEX%"=="done" goto done
 
 if "%~s1"=="" goto selftest
 
+set TEXMFOS=%~s1texmf-mswin-64
+if exist %TEXMFOS%\bin\mtxrun.exe goto start
+
+set TEXMFOS=%~s1\texmf-mswin-64
+if exist %TEXMFOS%\bin\mtxrun.exe goto start
+
 set TEXMFOS=%~s1texmf-mswin
 if exist %TEXMFOS%\bin\mtxrun.exe goto start
 
@@ -16,6 +22,12 @@ if exist %TEXMFOS%\bin\mtxrun.exe goto start
 
 :selftest
 
+set TEXMFOS=%~d0%~p0texmf-mswin-64
+if exist %TEXMFOS%\bin\mtxrun.exe goto start
+
+set TEXMFOS=%~d0%~p0\texmf-mswin-64
+if exist %TEXMFOS%\bin\mtxrun.exe goto start
+
 set TEXMFOS=%~d0%~p0texmf-mswin
 if exist %TEXMFOS%\bin\mtxrun.exe goto start