diff --git a/runtime/tutor/Make_all.mak b/runtime/tutor/Make_all.mak
new file mode 100644
index 0000000..c39f741
--- /dev/null
+++ b/runtime/tutor/Make_all.mak
@@ -0,0 +1,33 @@
+#
+# Makefile with common components
+#
+
+CONVERTED = \
+		tutor.utf-8 \
+		tutor.bar \
+		tutor.ca.utf-8 \
+		tutor.de.utf-8 \
+		tutor.el \
+		tutor.el.cp737 \
+		tutor.eo \
+		tutor.es \
+		tutor.fr.utf-8 \
+		tutor.hr \
+		tutor.hr.cp1250 \
+		tutor.hu \
+		tutor.hu.cp1250 \
+		tutor.it.utf-8 \
+		tutor.ja.sjis \
+		tutor.ja.euc \
+		tutor.ko.euc \
+		tutor.nl \
+		tutor.no.utf-8 \
+		tutor.nb \
+		tutor.nb.utf-8 \
+		tutor.ru \
+		tutor.ru.cp1251 \
+		tutor.sv.utf-8 \
+		tutor.tr.iso9 \
+		tutor.zh.utf-8
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make:
diff --git a/runtime/tutor/Make_mvc.mak b/runtime/tutor/Make_mvc.mak
new file mode 100644
index 0000000..bd62016
--- /dev/null
+++ b/runtime/tutor/Make_mvc.mak
@@ -0,0 +1,295 @@
+#
+# Makefile for converting the Vim tutorial on Windows.
+#
+# 21.11.23, Restorer, restorer@mail2k.ru
+
+
+!IF [powershell -nologo -noprofile "exit $$psversiontable.psversion.major"] == 2
+!ERROR The program "PowerShell" version 3.0 or higher is required to work
+!ENDIF
+
+# Common components
+!INCLUDE Make_all.mak
+
+# Correct the following line for the directory where iconv is installed.
+# Please do not put the path in quotes.
+ICONV_PATH = D:\Programs\GetText\bin
+
+# In case some package like GnuWin32, UnixUtils, gettext
+# or something similar is installed on the system.
+# If the "iconv" program is installed on the system, but it is not registered
+# in the %PATH% environment variable, then specify the full path to this file.
+!IF EXIST ("iconv.exe")
+ICONV = "iconv.exe"
+!ELSEIF EXIST ("$(ICONV_PATH)\iconv.exe")
+ICONV = "$(ICONV_PATH)\iconv.exe"
+!ENDIF
+
+RM = del /q
+CP = copy /y
+
+all : $(CONVERTED)
+
+tutor.utf-8 : tutor
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.bar : tutor.bar.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-1 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28591))
+!ENDIF
+
+tutor.ca.utf-8 : tutor.ca
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.de.utf-8 : tutor.de
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.el : tutor.el.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-7 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28597))
+!ENDIF
+
+tutor.el.cp737 : tutor.el.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t CP737 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(737))
+!ENDIF
+
+tutor.eo : tutor.eo.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-3 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28593))
+!ENDIF
+
+tutor.es : tutor.es.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-1 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28591))
+!ENDIF
+
+tutor.fr.utf-8 : tutor.fr
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.hr : tutor.hr.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-2 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28592))
+!ENDIF
+
+tutor.hr.cp1250 : tutor.hr.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t CP1250 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(1250))
+!ENDIF
+
+tutor.hu : tutor.hu.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-2 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28592))
+!ENDIF
+
+tutor.hu.cp1250 : tutor.hu.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t CP1250 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(1250))
+!ENDIF
+
+tutor.it.utf-8 : tutor.it
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.ja.sjis : tutor.ja.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t CP932 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(932))
+!ENDIF
+
+tutor.ja.euc : tutor.ja.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t EUC-JP $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(51932))
+!ENDIF
+
+tutor.ko.euc : tutor.ko.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t EUC-KR $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(51949))
+!ENDIF
+
+tutor.nl : tutor.nl.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-1 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28591))
+!ENDIF
+
+tutor.no.utf-8 : tutor.no
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+# nb is an alias for no
+tutor.nb : tutor.no
+	$(CP) tutor.no tutor.nb
+
+tutor.nb.utf-8 : tutor.no.utf-8
+	$(CP) tutor.no.utf-8 tutor.nb.utf-8
+
+tutor.ru : tutor.ru.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t KOI8-R $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(20866))
+!ENDIF
+
+tutor.ru.cp1251 : tutor.ru.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t CP1251 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(1251))
+!ENDIF
+
+tutor.sv.utf-8 : tutor.sv
+!IF DEFINED (ICONV)
+	$(ICONV) -f ISO-8859-1 -t UTF-8 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(28591)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+!ENDIF
+
+tutor.tr.iso9 : tutor.tr.utf-8
+!IF DEFINED (ICONV)
+	$(ICONV) -f UTF-8 -t ISO-8859-9 $? >$@
+!ELSE
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::WriteAllText(\"$@\", \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(65001)), \
+		[System.Text.Encoding]::GetEncoding(28599))
+!ENDIF
+
+tutor.zh.utf-8 : tutor.zh.big5
+	powershell -nologo -noprofile -Command \
+		[System.IO.File]::ReadAllText(\"$?\", \
+		[System.Text.Encoding]::GetEncoding(950)) ^| \
+		1>nul New-Item -Force -ItemType file -Path . -Name $@
+
+clean : $(CONVERTED)
+	!$(RM) $**
+
+# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make:
diff --git a/runtime/tutor/Makefile b/runtime/tutor/Makefile
index 3d1d560..484769e 100644
--- a/runtime/tutor/Makefile
+++ b/runtime/tutor/Makefile
@@ -5,27 +5,10 @@
 #
 # Similarly for Russian and Korean
 
-all: tutor.utf-8 \
-	tutor.bar \
-	tutor.ca.utf-8 \
-	tutor.de.utf-8 \
-	tutor.el tutor.el.cp737 \
-	tutor.eo \
-	tutor.es \
-	tutor.fr.utf-8 \
-	tutor.hr tutor.hr.cp1250 \
-	tutor.hu tutor.hu.cp1250 \
-	tutor.it.utf-8 \
-	tutor.ja.sjis tutor.ja.euc \
-	tutor.ko.euc \
-	tutor.nl \
-	tutor.no.utf-8 \
-	tutor.nb \
-	tutor.nb.utf-8 \
-	tutor.ru tutor.ru.cp1251 \
-	tutor.sv.utf-8 \
-	tutor.tr.iso9 \
-	tutor.zh.utf-8
+# Common components
+include Make_all.mak
+
+all: $(CONVERTED)
 
 tutor.utf-8: tutor
 	iconv -f ISO-8859-1 -t UTF-8 tutor > tutor.utf-8
@@ -46,7 +29,7 @@
 	iconv -f UTF-8 -t ISO-8859-7 tutor.el.utf-8 > tutor.el
 
 tutor.el.cp737: tutor.el.utf-8
-	iconv -f UTF-8 -t cp737 tutor.el.utf-8 > tutor.el.cp737
+	iconv -f UTF-8 -t CP737 tutor.el.utf-8 > tutor.el.cp737
 
 tutor.es: tutor.es.utf-8
 	iconv -f UTF-8 -t ISO-8859-1 tutor.es.utf-8 > tutor.es
@@ -58,16 +41,19 @@
 	iconv -f UTF-8 -t ISO-8859-2 tutor.hu.utf-8 > tutor.hu
 
 tutor.hu.cp1250: tutor.hu.utf-8
-	iconv -f UTF-8 -t cp1250 tutor.hu.utf-8 > tutor.hu.cp1250
+	iconv -f UTF-8 -t CP1250 tutor.hu.utf-8 > tutor.hu.cp1250
+
+tutor.it.utf-8: tutor.it
+	iconv -f ISO-8859-1 -t UTF-8 tutor.it > tutor.it.utf-8
 
 tutor.hr: tutor.hr.utf-8
 	iconv -f UTF-8 -t ISO-8859-2 tutor.hr.utf-8 > tutor.hr
 
 tutor.hr.cp1250: tutor.hr.utf-8
-	iconv -f UTF-8 -t cp1250 tutor.hr.utf-8 > tutor.hr.cp1250
+	iconv -f UTF-8 -t CP1250 tutor.hr.utf-8 > tutor.hr.cp1250
 
 tutor.ja.sjis: tutor.ja.utf-8
-	iconv -f UTF-8 -t cp932 tutor.ja.utf-8 > tutor.ja.sjis
+	iconv -f UTF-8 -t CP932 tutor.ja.utf-8 > tutor.ja.sjis
 
 tutor.ja.euc: tutor.ja.utf-8
 	iconv -f UTF-8 -t EUC-JP tutor.ja.utf-8 > tutor.ja.euc
@@ -92,7 +78,7 @@
 	iconv -f UTF-8 -t KOI8-R tutor.ru.utf-8 > tutor.ru
 
 tutor.ru.cp1251: tutor.ru.utf-8
-	iconv -f UTF-8 -t cp1251 tutor.ru.utf-8 > tutor.ru.cp1251
+	iconv -f UTF-8 -t CP1251 tutor.ru.utf-8 > tutor.ru.cp1251
 
 tutor.tr.iso9: tutor.tr.utf-8
 	iconv -f UTF-8 -t ISO-8859-9 tutor.tr.utf-8 > tutor.tr.iso9