diff --git a/ChangeLog b/ChangeLog
index e978fdf9ef..1fe941de95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-07  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/elements/gstcapsfilter.c: (gst_capsfilter_set_property):
+	  Allow NULL as filter-caps (which means "any").
+
 2005-08-05  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/libs/gstreamer-libs-sections.txt:
diff --git a/common b/common
index c99f9050f2..856fbbfa88 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c99f9050f296219783c6717efe319dc741d2e2d3
+Subproject commit 856fbbfa88621ab67df141ead8d4d3df32c5c176
diff --git a/gst/elements/gstcapsfilter.c b/gst/elements/gstcapsfilter.c
index dd9e0c818a..648ad24d9f 100644
--- a/gst/elements/gstcapsfilter.c
+++ b/gst/elements/gstcapsfilter.c
@@ -152,11 +152,14 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_FILTER_CAPS:{
-      GstCaps *new_caps = gst_caps_copy (gst_value_get_caps (value));
+      const GstCaps *new_caps_val = gst_value_get_caps (value);
+      GstCaps *new_caps;
       GstCaps *old_caps;
 
-      if (new_caps == NULL) {
+      if (new_caps_val == NULL) {
         new_caps = gst_caps_new_any ();
+      } else {
+        new_caps = gst_caps_copy (new_caps_val);
       }
 
       old_caps = capsfilter->filter_caps;
diff --git a/plugins/elements/gstcapsfilter.c b/plugins/elements/gstcapsfilter.c
index dd9e0c818a..648ad24d9f 100644
--- a/plugins/elements/gstcapsfilter.c
+++ b/plugins/elements/gstcapsfilter.c
@@ -152,11 +152,14 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case PROP_FILTER_CAPS:{
-      GstCaps *new_caps = gst_caps_copy (gst_value_get_caps (value));
+      const GstCaps *new_caps_val = gst_value_get_caps (value);
+      GstCaps *new_caps;
       GstCaps *old_caps;
 
-      if (new_caps == NULL) {
+      if (new_caps_val == NULL) {
         new_caps = gst_caps_new_any ();
+      } else {
+        new_caps = gst_caps_copy (new_caps_val);
       }
 
       old_caps = capsfilter->filter_caps;