diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f1487497eb..0d063c1c4a 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-27  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* ExternalTransforms.C (sanitizeLatexOption): fix regex to handle
+	"[,,,]" without warning message
+
 2004-10-26  Angus Leeming  <leeming@lyx.org>
 
 	* ExternalSupport.C (updateExternal):
@@ -76,7 +81,7 @@
 2004-09-24  Andreas Vox  <vox@isp.uni-luebeck.de>
 
 	* insetref.C (docbook): fixing problem where Docbook XML output
-        had unclosed <xref ... >
+	had unclosed <xref ... >
 
 2004-08-16  José Matos  <jamatos@lyx.org>
 
diff --git a/src/insets/ExternalTransforms.C b/src/insets/ExternalTransforms.C
index 4e0f73b4f3..0881679797 100644
--- a/src/insets/ExternalTransforms.C
+++ b/src/insets/ExternalTransforms.C
@@ -273,7 +273,7 @@ string const sanitizeLatexOption(string const & input)
 	string::const_iterator it = begin;
 
 	// Strip any leading commas
-	// "[,,,,foo..." -> "foo..."
+	// "[,,,,foo..." -> "foo..." ("foo..." may be empty)
 	string output;
 	boost::smatch what;
 	static boost::regex const front("^( *[[],*)(.*)$");
@@ -281,7 +281,7 @@ string const sanitizeLatexOption(string const & input)
 	regex_match(it, end, what, front, boost::match_partial);
 	if (!what[0].matched) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "
-		       << output << '\n';
+		       << input << '\n';
 		return string();
 	}
 	it =  what[1].second;
@@ -301,8 +301,8 @@ string const sanitizeLatexOption(string const & input)
 	}
 
 	// Strip any trailing commas
-	// "...foo,,,]" -> "...foo"
-	static boost::regex const back("^(.*[^,])(,*[]] *)$");
+	// "...foo,,,]" -> "...foo" ("...foo,,," may be empty)
+	static boost::regex const back("^(.*[^,])?(,*)([]] *)$");
 	regex_match(output, what, back);
 	if (!what[0].matched) {
 		lyxerr << "Unable to sanitize LaTeX \"Option\": "