diff --git a/src/ChangeLog b/src/ChangeLog
index 31bdf90615..7868791b91 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,8 @@
 
+2003-11-28  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* factory.C: Syntax change for CharStyles
+
 2003-11-28  André Pönitz  <poenitz@gmx.net>
 
 	* BufferView.[Ch]: make LyXText * text a private member
diff --git a/src/factory.C b/src/factory.C
index 41b8dcf02f..d69aad7c2f 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -331,9 +331,6 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
 		
 	lex.next();
 	string tmptok = lex.getString();
-	CharStyles::iterator found_cs = tclass.charstyle(tmptok);
-	if (found_cs != tclass.charstyles().end())
-		tmptok = "CharStyle";
 
 	// test the different insets
 	if (tmptok == "LatexCommand") {
@@ -406,6 +403,9 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
 		        || tmptok == "Ovalbox" || tmptok == "Frameless") {
 			inset.reset(new InsetBox(buf.params(), tmptok));
 		} else if (tmptok == "CharStyle") {
+			lex.next();
+			string s = lex.getString();
+			CharStyles::iterator found_cs = tclass.charstyle(s);
 			inset.reset(new InsetCharStyle(buf.params(), found_cs));
 		} else if (tmptok == "Branch") {
 			inset.reset(new InsetBranch(buf.params(), string()));
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index b87658fc70..32f2f048da 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,4 +1,7 @@
 
+2003-11-28  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* insetcharstyle.C: Syntax change for CharStyles
 
 2003-11-28  André Pönitz  <poenitz@gmx.net>
 
diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 0bba357496..26d5409cd8 100644
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -196,7 +196,7 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 
 void InsetCharStyleParams::write(ostream & os) const
 {
-	os << type << "\n";
+	os << "CharStyle " << type << "\n";
 }