4 files changed, 5 insertions, 8 deletions
diff --git a/runtime/spell/fo/main.aap b/runtime/spell/fo/main.aap
index b9be542cf..9e3eea42e 100644
--- a/runtime/spell/fo/main.aap
+++ b/runtime/spell/fo/main.aap
@@ -16,8 +16,7 @@ $SPELLDIR/fo.latin1.spl : $FILES
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fo fo_FO" -c q
 
 $SPELLDIR/fo.utf-8.spl : $FILES
-        :sys env LANG=fo_FO.UTF-8
-		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fo fo_FO" -c q
+        :sys $VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/fo fo_FO" -c q
 
 ../README_fo.txt : README_fo_FO.txt Copyright
         :cat $source >! $target
diff --git a/runtime/spell/gd/main.aap b/runtime/spell/gd/main.aap
index 8992f032c..658cbfc05 100644
--- a/runtime/spell/gd/main.aap
+++ b/runtime/spell/gd/main.aap
@@ -16,8 +16,7 @@ $SPELLDIR/gd.latin1.spl : $FILES
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q
 
 $SPELLDIR/gd.utf-8.spl : $FILES
-        :sys env LANG=gd_GB.UTF-8
-		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q
+        :sys $VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/gd gd_GB" -c q
 
 ../README_gd.txt : README_gd_GB.txt
         :copy $source $target
diff --git a/runtime/spell/gl/main.aap b/runtime/spell/gl/main.aap
index 2fc012aa3..504fda0ef 100644
--- a/runtime/spell/gl/main.aap
+++ b/runtime/spell/gl/main.aap
@@ -12,11 +12,11 @@ FILES    = gl_ES.aff gl_ES.dic
 all: $SPELLDIR/gl.latin1.spl $SPELLDIR/gl.utf-8.spl ../README_gl.txt
 
 $SPELLDIR/gl.latin1.spl : $FILES
-        :sys env LANG=gl_ES.ISO8859-1
+        :sys env LANG=es_ES.ISO8859-1
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gl gl_ES" -c q
 
 $SPELLDIR/gl.utf-8.spl : $FILES
-        :sys env LANG=gl_ES.UTF-8
+        :sys env LANG=es_ES.UTF-8
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gl gl_ES" -c q
 
 ../README_gl.txt : README_gl_ES.txt
diff --git a/runtime/spell/tl/main.aap b/runtime/spell/tl/main.aap
index 0145e4abc..49d86ac08 100644
--- a/runtime/spell/tl/main.aap
+++ b/runtime/spell/tl/main.aap
@@ -16,8 +16,7 @@ $SPELLDIR/tl.latin1.spl : $FILES
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/tl tl_PH" -c q
 
 $SPELLDIR/tl.utf-8.spl : $FILES
-        :sys env LANG=tl_PH.UTF-8
-		$VIM -u NONE -e -c "mkspell! $SPELLDIR/tl tl_PH" -c q
+        :sys $VIM -u NONE -e -c "set enc=utf-8" -c "mkspell! $SPELLDIR/tl tl_PH" -c q
 
 ../README_tl.txt : README_tl_PH.txt
         :copy $source $target