diff --git a/Filelist b/Filelist
index 6b52edb899c8e5ae1301c88f5376ce7e52f15223..cef3c5a1bef3d1c76bec2cc947cf78b3e6dae87a 100644
--- a/Filelist
+++ b/Filelist
@@ -681,6 +681,11 @@ LANG_GEN = \
runtime/spell/README.txt \
runtime/spell/??/*.diff \
runtime/spell/??/main.aap \
+ runtime/spell/tet/*.diff \
+ runtime/spell/tet/main.aap \
+ runtime/spell/check/main.aap \
+ runtime/spell/check/*.aff \
+ runtime/spell/check/*.dic \
runtime/spell/yi/README.txt \
runtime/spell/main.aap \
runtime/spell/*.vim \
diff --git a/runtime/spell/check/check_aa.aff b/runtime/spell/check/check_aa.aff
new file mode 100644
index 0000000000000000000000000000000000000000..20e16334fe449c3a34b79af9cf88499cbc044fbe
--- /dev/null
+++ b/runtime/spell/check/check_aa.aff
@@ -0,0 +1,50 @@
+SET ISO8859-1
+TRY esianrtolcdugmphbyfvkwjkqxz-лйикподавцьы'ESIANRTOLCDUGMPHBYFVKWJKQXZ
+
+FOL абвгдежзийклмнопрстуфхцшщъыьэюЯя
+LOW абвгдежзийклмнопрстуфхцшщъыьэюЯя
+UPP АБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮЯя
+
+SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZабвгдежзийклмнопрстуфхцшщъыьэюЯяАБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮї
+SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+MIDWORD '-
+
+PFXPOSTPONE
+
+COMPOUNDFLAG x
+COMPOUNDMIN 5
+
+KEEPCASE =
+RARE ?
+BAD !
+
+MAP 9
+MAP aабвгде
+MAP eийкл
+MAP iмноп
+MAP oтуфхц
+MAP uщъыь
+MAP nс
+MAP cз
+MAP yяэ
+MAP sЯ
+
+PFX A Y 1
+PFX A 0 aan .
+
+PFX B N 1
+PFX B 0 be .
+
+PFX C Y 1
+PFX C a in aa
+
+SFX J N 1
+SFX J 0 tje [aeiou][aeiou]
+
+SFX Z N 1
+SFX Z af ven aaf
+
+REP 2
+REP g ch
+REP cht gd
diff --git a/runtime/spell/check/check_aa.dic b/runtime/spell/check/check_aa.dic
new file mode 100644
index 0000000000000000000000000000000000000000..697a9c9e1b5ea6d716db564b23c1bac9ae32ebfe
--- /dev/null
+++ b/runtime/spell/check/check_aa.dic
@@ -0,0 +1,12 @@
+1234
+#Some Comment that isn't supposed to matter
+/Another Comment that isn't supposed to matter
+'s-Graveland
+A4
+AagJe
+Aalburg/xZBCJZ
+Aals'meer/x
+Aal-ten/x
+Aalburgers/x
+Aalsmeer/x
+Aalten/x
diff --git a/runtime/spell/check/check_bb.aff b/runtime/spell/check/check_bb.aff
new file mode 100644
index 0000000000000000000000000000000000000000..20e16334fe449c3a34b79af9cf88499cbc044fbe
--- /dev/null
+++ b/runtime/spell/check/check_bb.aff
@@ -0,0 +1,50 @@
+SET ISO8859-1
+TRY esianrtolcdugmphbyfvkwjkqxz-лйикподавцьы'ESIANRTOLCDUGMPHBYFVKWJKQXZ
+
+FOL абвгдежзийклмнопрстуфхцшщъыьэюЯя
+LOW абвгдежзийклмнопрстуфхцшщъыьэюЯя
+UPP АБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮЯя
+
+SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZабвгдежзийклмнопрстуфхцшщъыьэюЯяАБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮї
+SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+
+MIDWORD '-
+
+PFXPOSTPONE
+
+COMPOUNDFLAG x
+COMPOUNDMIN 5
+
+KEEPCASE =
+RARE ?
+BAD !
+
+MAP 9
+MAP aабвгде
+MAP eийкл
+MAP iмноп
+MAP oтуфхц
+MAP uщъыь
+MAP nс
+MAP cз
+MAP yяэ
+MAP sЯ
+
+PFX A Y 1
+PFX A 0 aan .
+
+PFX B N 1
+PFX B 0 be .
+
+PFX C Y 1
+PFX C a in aa
+
+SFX J N 1
+SFX J 0 tje [aeiou][aeiou]
+
+SFX Z N 1
+SFX Z af ven aaf
+
+REP 2
+REP g ch
+REP cht gd
diff --git a/runtime/spell/check/check_bb.dic b/runtime/spell/check/check_bb.dic
new file mode 100644
index 0000000000000000000000000000000000000000..c01e7169ae1f7e6314d05b05782e83b26f341952
--- /dev/null
+++ b/runtime/spell/check/check_bb.dic
@@ -0,0 +1,12 @@
+1234
+#Some Comment that isn't supposed to matter
+/Another Comment that isn't supposed to matter
+'s-Graveland
+A4
+AagJe
+Aalburg/xZBCJZ
+Aals'meer/x
+Aal-ten/x
+foobar/=
+rare/?
+Emacs/!
diff --git a/runtime/spell/check/main.aap b/runtime/spell/check/main.aap
new file mode 100644
index 0000000000000000000000000000000000000000..a47351f7ec896040dfbaed56cef553f5506d103f
--- /dev/null
+++ b/runtime/spell/check/main.aap
@@ -0,0 +1,15 @@
+# Aap recipe for a dummy spell file.
+# This is used to check if the .spl file format changes.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+ VIM = ../../../src/vim
+@else:
+ :progsearch VIM vim
+
+all: check.latin1.spl
+
+check.latin1.spl : $VIM check_aa.aff check_aa.dic check_bb.aff check_bb.dic
+ :sys $VIM -u NONE -e -c "mkspell! check check_aa check_bb" -c q
+
+# vim: set sts=4 sw=4 :
diff --git a/runtime/spell/tet/main.aap b/runtime/spell/tet/main.aap
new file mode 100644
index 0000000000000000000000000000000000000000..617c8a24eb033f343cd2bb8fe7249e829649dda3
--- /dev/null
+++ b/runtime/spell/tet/main.aap
@@ -0,0 +1,79 @@
+# Aap recipe for Tetum Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+ VIM = ../../../src/vim
+@else:
+ :progsearch VIM vim
+
+SPELLDIR = ..
+FILES = tet_ID.aff tet_ID.dic
+
+# I don't hava a Tetum locale, use the Dutch one instead.
+all: $SPELLDIR/tet.latin1.spl $SPELLDIR/tet.utf-8.spl ../README_tet.txt
+
+$SPELLDIR/tet.latin1.spl : $FILES
+ :sys env LANG=nl_NL.ISO8859-1
+ $VIM -u NONE -e -c "mkspell! $SPELLDIR/tet tet_ID" -c q
+
+$SPELLDIR/tet.utf-8.spl : $FILES
+ :sys env LANG=nl_NL.UTF-8
+ $VIM -u NONE -e -c "mkspell! $SPELLDIR/tet tet_ID" -c q
+
+../README_tet.txt : README_tet_ID.txt
+ :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} tet_ID.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+tet_ID.aff tet_ID.dic: {buildcheck=}
+ :assertpkg unzip patch
+ :fetch tet_ID.zip
+ :sys $UNZIP tet_ID.zip
+ :delete tet_ID.zip
+ @if not os.path.exists('tet_ID.orig.aff'):
+ :copy tet_ID.aff tet_ID.orig.aff
+ @if not os.path.exists('tet_ID.orig.dic'):
+ :copy tet_ID.dic tet_ID.orig.dic
+ @if os.path.exists('tet_ID.diff'):
+ :sys patch <tet_ID.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+ :assertpkg diff
+ :sys {force} diff -a -C 1 tet_ID.orig.aff tet_ID.aff >tet_ID.diff
+ :sys {force} diff -a -C 1 tet_ID.orig.dic tet_ID.dic >>tet_ID.diff
+
+
+# Check for updated OpenOffice spell files. When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+ :assertpkg unzip diff
+ :fetch tet_ID.zip
+ :mkdir tmp
+ :cd tmp
+ @try:
+ @import stat
+ :sys $UNZIP ../tet_ID.zip
+ :sys {force} diff ../tet_ID.orig.aff tet_ID.aff >d
+ @if os.stat('d')[stat.ST_SIZE] > 0:
+ :copy tet_ID.aff ../tet_ID.new.aff
+ :sys {force} diff ../tet_ID.orig.dic tet_ID.dic >d
+ @if os.stat('d')[stat.ST_SIZE] > 0:
+ :copy tet_ID.dic ../tet_ID.new.dic
+ @finally:
+ :cd ..
+ :delete {r}{f}{q} tmp
+ :delete tet_ID.zip
+
+
+# vim: set sts=4 sw=4 :
diff --git a/runtime/spell/tet/tet_ID.diff b/runtime/spell/tet/tet_ID.diff
new file mode 100644
index 0000000000000000000000000000000000000000..941121c8837a93ee9bb09fdc5a2faa278cdf88f0
--- /dev/null
+++ b/runtime/spell/tet/tet_ID.diff
@@ -0,0 +1,26 @@
+*** tet_ID.orig.aff Wed Aug 31 21:14:37 2005
+--- tet_ID.aff Wed Aug 31 21:15:15 2005
+***************
+*** 19 ****
+--- 19,39 ----
+ TRY aineousrthlkmdbp'fTvgzLAINjSPEMйD-KHбуFRUBGJъOcнwxCWXVсгБqкзZУQyвН
++
++ FOL Яабвгдежзийклмнопрстуфхцшщъыьэюя
++ LOW Яабвгдежзийклмнопрстуфхцшщъыьэюя
++ UPP ЯАБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮя
++
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZабвгдежзийклмнопрстуфхцшщъыьэюЯяАБВГДЕЖЗИЙКЛМНОПРСТУФХЦШЩЪЫЬЭЮї
++ SOFOTO ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++
++ MIDWORD '-
++
++ MAP 9
++ MAP aабвгде
++ MAP eийкл
++ MAP iмноп
++ MAP oтуфхц
++ MAP uщъыь
++ MAP nс
++ MAP cз
++ MAP yяэ
++ MAP sЯ