diff --git a/ChangeLog b/ChangeLog
index d3d93b230..6ad653974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-10 Gary Burton <gary.burton@zen.co.uk>
+	* src/plugins/IndivComplete.py: added support for printing
+	non-primary, non-family events.
+
 2007-11-07 Jim Sack <jgsack@san.rr.com>
 	* src/ArgHandler.py: typos in cl_export at L562,3 bug #1353
 	triggered by exporting gedcom
diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py
index 5ae4a2f77..22ab01758 100644
--- a/src/plugins/IndivComplete.py
+++ b/src/plugins/IndivComplete.py
@@ -114,11 +114,17 @@ class IndivCompleteReport(Report):
         cell.set_longlist(1)
         self.doc.add_cell_style("IDS-ListCell",cell)
 
-    def write_fact(self,event):
+    def write_fact(self,event_ref):
+        event = self.database.get_event_from_handle(event_ref.ref)
         if event == None:
             return
         text = ""
-        name = str(event.get_type())
+        if event_ref.get_role() == RelLib.EventRoleType.PRIMARY or \
+           event_ref.get_role() == RelLib.EventRoleType.FAMILY:
+            name = str(event.get_type())
+        else:
+            name = '%(event)s (%(role)s)' % {'event' : str(event.get_type()),
+                                             'role' : event_ref.get_role()}
 
         date = DateHandler.get_date(event)
         place_handle = event.get_place_handle()
@@ -345,8 +351,7 @@ class IndivCompleteReport(Report):
             
             for event_ref in family.get_event_ref_list():
                 if event_ref:
-                    event = self.database.get_event_from_handle(event_ref.ref)
-                    self.write_fact(event)
+                    self.write_fact(event_ref)
 
             child_ref_list = family.get_child_ref_list()
             if len(child_ref_list):
@@ -407,11 +412,10 @@ class IndivCompleteReport(Report):
         self.doc.end_cell()
         self.doc.end_row()
 
-        event_ref_list = self.start_person.get_primary_event_ref_list()
+        event_ref_list = self.start_person.get_event_ref_list()
         for event_ref in event_ref_list:
             if event_ref:
-                event = self.database.get_event_from_handle(event_ref.ref)
-                self.write_fact(event)
+                self.write_fact(event_ref)
         self.doc.end_table()
         self.doc.start_paragraph("IDS-Normal")
         self.doc.end_paragraph()