diff --git a/ChangeLog b/ChangeLog
index 6300e54e..5fdda785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,10 @@ v0.91.5		18-Feb-2007
 	lang:
 		Language prompts 44, 75 and 76 are obsolete.
 
+	script:
+		Adjusted editor script to use nansi.sys if ansi.sys is not
+		available in the terminfo database.
+
 	examples:
 		Upgraded the html macro templates to produce UTF-8 web pages.
 
diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c
index cd04fb45..23f71981 100644
--- a/mbsebbs/mail.c
+++ b/mbsebbs/mail.c
@@ -2824,7 +2824,6 @@ int Ext_Edit()
 	fprintf(fd,"BBSFSEDKEYS='%d'\n",exitinfo.FSemacs);
 	fprintf(fd,"LINES='%d'\n",rows);
 	fprintf(fd,"COLUMNS='80'\n");
-	fprintf(fd,"UTF8='%s'\n",utf8?"Yes":"No");
 	fclose(fd);
     }
 
diff --git a/script/editor.in b/script/editor.in
index e75b234d..f333b3d0 100644
--- a/script/editor.in
+++ b/script/editor.in
@@ -13,7 +13,11 @@ function alarma
 }
 
 ## Set term environmment 
-export JOETERM=nansi.sys
+if [ -f /usr/share/terminfo/a/ansi.sys ]; then
+  export JOETERM=ansi.sys
+else
+  export JOETERM=nansi.sys
+fi
 
 ## Read variables from data.msg
 . $HOME/data.msg
@@ -23,11 +27,7 @@ TIME=`head -n19 $HOME/door.sys  |tail -n1  |tr -d "[:cntrl:]"`
 
 ## Set preferred editor and parameters
 EDITOR=@joebin@/bbsjoe
-if [ "$UTF8" == "Yes" ]; then
-    PARAM="-guess_utf8 $HOME/edit.msg"
-else
-    PARAM="$HOME/edit.msg"
-fi
+PARAM="$HOME/edit.msg"
 
 # Using joe with emacs keys:
 # You can make a bbsjmacsrc file with emacs keys and put it
@@ -91,7 +91,7 @@ alarma $TIME $EDITOR &
 
 ## Draw header and call editor
 echo -e "                                                                                 "
-echo -e "$LANGAREA: $AREANUM $AREA $UTF8 $TERM $JOETERM"
+echo -e "$LANGAREA: $AREANUM $AREA"
 echo -e "$LANGFROM: $MSGFROM $MSGFROMADDR"
 echo -e "$LANGTO: $MSGTO $MSGTOADDR"
 echo -e "$LANGRE: $MSGSUBJECT"