diff --git a/ChangeLog b/ChangeLog
index 87bfa676a..3866e4c69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDb/_ReadGedcom.py: set author properly for GEDCOM name
+	on default source
+
 2006-04-16  Brian Matherly  <pez4brian@users.sourceforge.net>
 	* src/plugins/DescendReport.py: Don't sort children (Bug #1453010)
 
diff --git a/src/GrampsDb/_ReadGedcom.py b/src/GrampsDb/_ReadGedcom.py
index c85e6c21d..bb18e6b6c 100644
--- a/src/GrampsDb/_ReadGedcom.py
+++ b/src/GrampsDb/_ReadGedcom.py
@@ -1766,7 +1766,9 @@ class GedcomParser:
                 self.def_src.set_title(_("Import from %s") % filename)
             elif matches[1] == TOKEN_COPR:
                 self.def_src.set_publication_info(matches[2])
-            elif matches[1] in (TOKEN_CORP,TOKEN_DATA,TOKEN_SUBM,TOKEN_SUBN,TOKEN_LANG):
+            elif matches[1] ==  TOKEN_SUBM:
+                self.parse_subm(1)
+            elif matches[1] in (TOKEN_CORP,TOKEN_DATA,TOKEN_SUBN,TOKEN_LANG):
                 self.ignore_sub_junk(2)
             elif matches[1] == TOKEN_DEST:
                 if genby == "GRAMPS":
@@ -1795,6 +1797,18 @@ class GedcomParser:
             else:
                 self.barf(2)
 
+    def parse_subm(self, level):
+        while True:
+            matches = self.get_next()
+
+            if int(matches[0]) < level:
+                self.backup()
+                return
+            elif matches[1] == TOKEN_NAME:
+                self.def_src.set_author(matches[2])
+            else:
+                self.ignore_sub_junk(2)
+
     def parse_ftw_schema(self,level):
         while True:
             matches = self.get_next()