diff --git a/src/fileio.c b/src/fileio.c
index ed5a653..60c62d5 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -583,8 +583,13 @@
 			/* set forced 'fileencoding' */
 			fenc = enc_canonize(eap->cmd + eap->force_enc);
 			if (fenc != NULL)
+			{
 			    set_string_option_direct((char_u *)"fenc", -1,
 						    fenc, OPT_FREE|OPT_LOCAL);
+# ifdef FEAT_EVAL
+			    set_option_scriptID((char_u *)"fenc", current_SID);
+# endif
+			}
 			vim_free(fenc);
 		    }
 #endif
@@ -2108,8 +2113,13 @@
 #ifdef FEAT_MBYTE
     /* If editing a new file: set 'fenc' for the current buffer. */
     if (newfile)
+    {
 	set_string_option_direct((char_u *)"fenc", -1, fenc,
 							  OPT_FREE|OPT_LOCAL);
+# ifdef FEAT_EVAL
+	set_option_scriptID((char_u *)"fenc", current_SID);
+# endif
+    }
     if (fenc_alloced)
 	vim_free(fenc);
 # ifdef USE_ICONV