diff --git a/ChangeLog b/ChangeLog
index 2828b48b6..9e97b2c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-07-29  Brian Matherly <brian@gramps-project.org>
+	* src/plugins/MarkerReport.py: Change the way marker types are collected.
+
 2007-07-28  Brian Matherly <brian@gramps-project.org>
 	* src/plugins/MarkerReport.py: Enhanced
 	* src/Filters/Rules/Event/_HasMarkerOf.py: Added
diff --git a/src/plugins/MarkerReport.py b/src/plugins/MarkerReport.py
index f8df2bf1d..3ab9c250e 100644
--- a/src/plugins/MarkerReport.py
+++ b/src/plugins/MarkerReport.py
@@ -455,9 +455,16 @@ class MarkerOptions(ReportOptions):
         self.marker_menu = gtk.combo_box_new_text()
         index = 0
         marker_index = 0
-        markers = dialog.db.get_marker_types()
-        markers.append(MarkerType().get_map()[MarkerType.COMPLETE])
-        markers.append(MarkerType().get_map()[MarkerType.TODO_TYPE])
+        markers = []
+        
+        # Gather all the possible markers
+        map = MarkerType().get_map()
+        for key in map.keys():
+            if key != MarkerType.CUSTOM and map[key] != "":
+                markers.append( map[key] )
+        markers += dialog.db.get_marker_types()
+        
+        # Add the markers to the menu
         for marker in markers:
             self.marker_menu.append_text(marker)
             if self.options_dict['marker'] == marker: