diff --git a/src/plugins/SameSurnames.py b/src/plugins/SameSurnames.py
index 98e36c0c3..0f78c5bdd 100644
--- a/src/plugins/SameSurnames.py
+++ b/src/plugins/SameSurnames.py
@@ -3,6 +3,7 @@
 #
 # Copyright (C) 2000-2007  Donald N. Allingham
 # Copyright (C) 2007-2008  Brian G. Matherly
+# Copyright (C) 2009       Douglas S. Blank
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,13 +21,14 @@
 #
 
 """
-Display a people who have a person's same surname
+Display a people who have a person's same surname or given name
 """
 
 from Simple import SimpleAccess, SimpleDoc, SimpleTable
 from gettext import gettext as _
 from gen.plug import PluginManager
-from ReportBase import CATEGORY_QR_PERSON
+import gen.lib
+from ReportBase import CATEGORY_QR_PERSON, CATEGORY_QR_MISC
 from Filters.Rules import Rule
 from Filters import GenericFilterFactory
 
@@ -54,6 +56,35 @@ class SameSurname(Rule):
                 return True
         return False
 
+class SameGiven(Rule):
+    """People with same given name"""
+    labels      = [_('Substring:')]
+    name        = _('People matching the <given>')
+    description = _("Matches people with same given name")
+    category    = _('General filters')
+    def apply(self,db,person):
+        src = self.list[0].upper()
+        for name in [person.get_primary_name()] + person.get_alternate_names():
+            if name.first_name:
+                if " " in name.first_name.strip():
+                    for name in name.first_name.upper().strip().split():
+                        if name == src.upper():
+                            return True
+                elif name.first_name.upper() == src.upper():
+                    return True
+        return False
+
+class IncompleteGiven(Rule):
+    """People with incomplete given names"""
+    name        = _('People with incomplete given names')
+    description = _("Matches people with firstname missing")
+    category    = _('General filters')
+    def apply(self,db,person):
+        for name in [person.get_primary_name()] + person.get_alternate_names():
+            if name.get_first_name() == "":
+                return True
+        return False
+
 def run(database, document, person):
     """
     Loops through the families that the person is a child in, and display
@@ -63,12 +94,12 @@ def run(database, document, person):
     sdb = SimpleAccess(database)
     sdoc = SimpleDoc(document)
     stab = SimpleTable(sdb)
-    if isinstance(person, str):
-        surname = person
-        rsurname = person
-    else:
+    if isinstance(person, gen.lib.Person):
         surname = sdb.surname(person)
         rsurname = person.get_primary_name().get_group_name()
+    else:
+        surname = person
+        rsurname = person
     # display the title
     sdoc.title(_("People with the surname '%s'") % surname)
     sdoc.paragraph("")
@@ -89,7 +120,43 @@ def run(database, document, person):
         matches += 1
     sdoc.paragraph(_("There are %d people with a matching name, or alternate name.\n") % matches)
     stab.write(sdoc)
-                    
+
+def run_given(database, document, person):
+    """
+    Loops through the families that the person is a child in, and display
+    the information about the other children.
+    """
+    # setup the simple access functions
+    sdb = SimpleAccess(database)
+    sdoc = SimpleDoc(document)
+    stab = SimpleTable(sdb)
+    if isinstance(person, gen.lib.Person):
+        rgivenname = person.get_primary_name().get_first_name()
+    else:
+        rgivenname = person
+    if " " in rgivenname.strip():
+        rgivenname, second = rgivenname.strip().split(" ", 1)
+    # display the title
+    sdoc.title(_("People with the given name '%s'") % rgivenname)
+    sdoc.paragraph("")
+    stab.columns(_("Person"), _("Birth Date"), _("Name type"))
+    filter = GenericFilterFactory('Person')()
+    if rgivenname != '':
+        rule = SameGiven([rgivenname])
+    else:
+        rule = IncompleteGiven([])
+    filter.add_rule(rule)
+    people = filter.apply(database, 
+                          database.get_person_handles(sort_handles=False))
+    matches = 0
+    for person_handle in people:
+        person = database.get_person_from_handle(person_handle)
+        stab.row(person, sdb.birth_date_obj(person),
+                 str(person.get_primary_name().get_type()))
+        matches += 1
+    sdoc.paragraph(_("There are %d people with a matching name, or alternate name.\n") % matches)
+    stab.write(sdoc)
+
 #------------------------------------------------------------------------
 #
 # 
@@ -106,3 +173,25 @@ pmgr.register_quick_report(
     author_name="Douglas S. Blank",
     author_email="dblank@cs.brynmawr.edu"
     )
+
+pmgr.register_quick_report(
+    name = 'samegivens',
+    category = CATEGORY_QR_PERSON, # to run with a person object
+    run_func = run_given,
+    translated_name = _("Same Given Names"),
+    status = _("Stable"),
+    description= _("Display people with the same given name as a person."),
+    author_name="Douglas S. Blank",
+    author_email="dblank@cs.brynmawr.edu"
+    )
+
+pmgr.register_quick_report(
+    name = 'samegivens_misc',
+    category = CATEGORY_QR_MISC, # to run with a given text
+    run_func = run_given,
+    translated_name = _("Same Given Names"),
+    status = _("Stable"),
+    description= _("Display people with the same given name as a person."),
+    author_name="Douglas S. Blank",
+    author_email="dblank@cs.brynmawr.edu"
+    )