--- a/ClassDescription.st	Fri Sep 25 22:01:07 2015 +0100
+++ b/ClassDescription.st	Sat Sep 26 06:57:11 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -1525,7 +1527,7 @@
      (recommended if multiple images operate on a common changes file)"
 
     |streamType changesStream fileName
-     encoding encoder changeFileIsNew|
+     encoding changeFileIsNew|
 
     fileName := ObjectMemory nameForChanges.
 
@@ -1545,19 +1547,18 @@
 
     changeFileIsNew := changesStream fileSize = 0.
     changeFileIsNew ifTrue:[
-        encoder := CharacterEncoder encoderForUTF8.
+        encoding := #utf8.
     ] ifFalse:[
         encoding := CharacterEncoder guessEncodingOfStream:changesStream.
         encoding isNil ifTrue:[
             encoding := #'iso8859-1'.
         ].
-        encoder := CharacterEncoder encoderFor:encoding.
     ].
     changesStream setToEnd.
 
-    changesStream := EncodedStream stream:changesStream encoder:encoder.
+    changesStream := EncodedStream stream:changesStream encoding:encoding.
     changeFileIsNew ifTrue:[
-        changesStream nextPutLine:'"{ Encoding: ' , encoder nameOfEncoding , ' }" !!'.
+        changesStream nextPutLine:'"{ Encoding: ' , encoding , ' }" !!'.
     ].
 
     ^ changesStream