diff --git a/ChangeLog b/ChangeLog
index d6caaebc5f..42be076e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-03  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/parse/parse.l:
+	  Commit patch for parse_launch syntax from #331255. Removes 
+	  support for quoted strings and mimetypes when writing filtered 
+	  caps. See the bug report for more details - I'm pretty sure this
+	  obscure feature is not in use by _anyone_ anywhere.
+
+	  With this simple change, the size of the gstreamer.so here 
+	  drops from 2193KB to 1565KB.
+
 2006-03-03  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* plugins/elements/gsttypefindelement.h:
diff --git a/gst/parse/parse.l b/gst/parse/parse.l
index f47f1d3ac6..d7b5e1161a 100644
--- a/gst/parse/parse.l
+++ b/gst/parse/parse.l
@@ -39,9 +39,8 @@ _operator [(){}.!,;=]
 _identifier [[:alpha:]][[:alnum:]\-_%:]*
 
 _char ("\\".)|([^[:space:]])
-_string {_char}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'")
+_string {_char}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\'")*"'")
 
-_comma [[:space:]]*","[[:space:]]*
 _assign [[:space:]]*"="[[:space:]]*
 
 _protocol [[:alpha:]][[:alnum:]+-\.]*
@@ -56,10 +55,10 @@ _ref {_identifier}"."{_identifier}?
 _binref {_identifier}[[:space:]]*"."[[:space:]]*"("
 
 /* links */
-_mimechar ([[:alnum:]-])
-_mimetype ({_mimechar}+"/"{_mimechar}+)|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'")
+_mimechar [[:alnum:]-]
+_mimetype {_mimechar}+"/"{_mimechar}+
 _capschar ("\\".)|([^\;!])
-_capsstring {_capschar}+|("\""([^\"]|"\\\"")*"\"")|("'"([^']|"\\\"")*"'")
+_capsstring {_capschar}+
 _caps {_mimetype}(","[^!]|{_capsstring})*
 _link ("!"[[:space:]]*{_caps}([[:space:]]*(";"[[:space:]]*{_caps})*[[:space:]]*)*"!")|("!")