diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 037f06ea0..af57277a2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-08-22  Alex Roitman  <shura@gramps-project.org>
+	* src/Filters/_FilterParser.py (startElement): Upgrade existing
+	custom_filters file from Media to MediaObject.
 	* src/Selectors/_SelectEvent.py (get_handle_column): Correct
 	handle column number.
 	* configure.in: Reflect directory change.
diff --git a/gramps2/src/Filters/_FilterParser.py b/gramps2/src/Filters/_FilterParser.py
index 7bf7a68db..5cebfed37 100644
--- a/gramps2/src/Filters/_FilterParser.py
+++ b/gramps2/src/Filters/_FilterParser.py
@@ -59,6 +59,8 @@ class FilterParser(handler.ContentHandler):
         if tag == "object":
             if attrs.has_key('type'):
                 self.namespace = attrs['type']
+                if self.namespace == 'Media':
+                    self.namespace = 'MediaObject'
             else:
                 self.namespace = "generic"
         elif tag == "filter":