diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2d145f5f2..71c0dd1af 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -65,7 +65,7 @@ jobs:
 
       - name: Add TinyTeX to PATH
         run: |
-          echo "$APPDATA\TinyTeX\bin\win32" >> $GITHUB_PATH
+          echo "$APPDATA\TinyTeX\bin\windows" >> $GITHUB_PATH
         shell: bash
 
       - name: Build TinyTeX-0.zip
diff --git a/R/latex.R b/R/latex.R
index a649ea221..8a31ae393 100644
--- a/R/latex.R
+++ b/R/latex.R
@@ -36,7 +36,7 @@
 #' so that \code{latexmk()} knows where to find executables like
 #' \command{pdflatex}. For example, if you are using Windows and your TinyTeX is
 #' on an external drive \file{Z:/} under the folder \file{TinyTeX}, you may set
-#' \code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/win32/tlmgr.bat")}.
+#' \code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/windows/tlmgr.bat")}.
 #' Usually you should not need to set this option because TinyTeX can add itself
 #' to the \code{PATH} variable during installation or via
 #' \code{\link{use_tinytex}()}. In case both methods fail, you can use this
diff --git a/man/latexmk.Rd b/man/latexmk.Rd
index 1a5cf19e2..ce4b78a49 100644
--- a/man/latexmk.Rd
+++ b/man/latexmk.Rd
@@ -106,7 +106,7 @@ If you are using the LaTeX distribution TinyTeX, but its path is not in the
 so that \code{latexmk()} knows where to find executables like
 \command{pdflatex}. For example, if you are using Windows and your TinyTeX is
 on an external drive \file{Z:/} under the folder \file{TinyTeX}, you may set
-\code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/win32/tlmgr.bat")}.
+\code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/windows/tlmgr.bat")}.
 Usually you should not need to set this option because TinyTeX can add itself
 to the \code{PATH} variable during installation or via
 \code{\link{use_tinytex}()}. In case both methods fail, you can use this
diff --git a/tools/install-bin-windows.bat b/tools/install-bin-windows.bat
index a29317d2c..ae3d9ed35 100644
--- a/tools/install-bin-windows.bat
+++ b/tools/install-bin-windows.bat
@@ -51,7 +51,7 @@ rd /s /q "%APPDATA%\TinyTeX"
 move /y TinyTeX "%APPDATA%"
 
 echo add tlmgr to PATH
-cd /d "%APPDATA%\TinyTeX\bin\win32"
+cd /d "%APPDATA%\TinyTeX\bin\win*"
 call tlmgr path add
 if /i not "%CI%"=="true" call tlmgr option repository ctan
 call tlmgr postaction install script xetex
diff --git a/tools/install-windows-base.R b/tools/install-windows-base.R
index a3cf74b04..143a94144 100644
--- a/tools/install-windows-base.R
+++ b/tools/install-windows-base.R
@@ -3,7 +3,7 @@
 owd = setwd('tools')
 f = 'install-windows.bat'
 x = readLines(f)
-i = x == r"(call "%APPDATA%\TinyTeX\bin\win32\tlmgr" install %pkgs%)"
+i = x == r"(call tlmgr install %pkgs%)"
 if (sum(i) != 1)
   stop('The script ', f, ' should contain a line to install extra LaTeX packages.')
 x = x[!i]
diff --git a/tools/install-windows.bat b/tools/install-windows.bat
index b0350e15b..2d4938c51 100755
--- a/tools/install-windows.bat
+++ b/tools/install-windows.bat
@@ -57,8 +57,10 @@ for /F %%a in (pkgs-custom.txt) do set "pkgs=!pkgs! %%a"
 
 del pkgs-custom.txt
 
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" conf texmf max_print_line 10000
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" path add
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" install %pkgs%
+pushd "%APPDATA%\TinyTeX\bin\win*"
+call tlmgr conf texmf max_print_line 10000
+call tlmgr path add
+call tlmgr install %pkgs%
+popd
 
 pause