diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 49f1b097b..9e0bc58b7 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,10 +1,12 @@
 2006-07-27  Alex Roitman  <shura@gramps-project.org>
+	* src/GrampsDb/_ReadGrdb.py: Re-map name formats on import.
 	* src/GrampsDb/_GrampsBSDDB.py (_load_metadata): Upgrade custom
 	name formats.
 	* src/GrampsDb/_ReadXML.py (start_format): Attempt parsing the
-	active state for the custom name format.
+	active state for the custom name format; re-map format numbers on
+	import.
 	* src/GrampsDb/_WriteXML.py (write_name_formats): Write 4-tuple
-	custom name formats; 
+	custom name formats; Write formats in the beginning of data;
 	(_xml_version): Output as version 1.1.1.
 	* data/grampsxml.rng: Update XML description for 1.1.1.
 	* data/grampsxml.dtd: Update XML description for 1.1.1.
diff --git a/gramps2/data/grampsxml.dtd b/gramps2/data/grampsxml.dtd
index 113846a27..9c6c41de7 100644
--- a/gramps2/data/grampsxml.dtd
+++ b/gramps2/data/grampsxml.dtd
@@ -51,8 +51,8 @@ DATABASE
 	bookmarks
 -->
 
-<!ELEMENT database (header, events?, people?, families?, sources?, places?,
-                    objects?, repositories?, bookmark?, name-formats?)>
+<!ELEMENT database (header, name-formats?, events?, people?, families?,
+                    sources?, places?, objects?, repositories?, bookmark?)>
 <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.1/">
 
 <!--	************************************************************
diff --git a/gramps2/data/grampsxml.rng b/gramps2/data/grampsxml.rng
index 33bf497be..956e6d2e9 100644
--- a/gramps2/data/grampsxml.rng
+++ b/gramps2/data/grampsxml.rng
@@ -46,6 +46,12 @@
         </element></optional>
       </element>
 
+      <optional><element name="name-formats">
+          <zeroOrMore><element name="format">
+              <ref name="format-content"/>
+          </element></zeroOrMore>
+      </element></optional>
+
       <optional><element name="events">
           <zeroOrMore><element name="event">
               <ref name="event-content"/>
@@ -98,11 +104,6 @@
           </element></zeroOrMore>
       </element></optional>
 
-      <optional><element name="name-formats">
-          <zeroOrMore><element name="format">
-              <ref name="format-content"/>
-          </element></zeroOrMore>
-      </element></optional>
   </element></start>
 
   <define name="researcher-content">
diff --git a/gramps2/src/GrampsDb/_ReadGrdb.py b/gramps2/src/GrampsDb/_ReadGrdb.py
index 78059ba38..07028f336 100644
--- a/gramps2/src/GrampsDb/_ReadGrdb.py
+++ b/gramps2/src/GrampsDb/_ReadGrdb.py
@@ -41,6 +41,7 @@ from _GrampsBSDDB import GrampsBSDDB
 from QuestionDialog import ErrorDialog
 from Errors import HandleError
 from BasicUtils import UpdateCallback
+import NameDisplay
 
 #-------------------------------------------------------------------------
 #
@@ -75,7 +76,16 @@ def importData(database, filename, callback=None,cl=0,use_trans=True):
                         _("The Database version is not supported "
                           "by this version of GRAMPS."))
         return
-        
+
+    # If other_database contains its custom name formats,
+    # we need to do tricks to remap the format numbers
+    if len(other_database.name_formats) > 0:
+        formats_map = remap_name_formats(database,other_database)
+        NameDisplay.displayer.register_custom_formats(database.name_formats)
+        get_person = make_peron_name_remapper(other_database,formats_map)
+    else:
+        # No remapping necessary, proceed as usual
+        get_person = other_database.get_person_from_handle
 
     # Prepare table and method definitions
     tables = {
@@ -84,7 +94,7 @@ def importData(database, filename, callback=None,cl=0,use_trans=True):
                     'add_obj' : database.add_person,
                     'find_next_gramps_id' :database.find_next_person_gramps_id,
                     'other_get_from_handle':
-                    other_database.get_person_from_handle,
+                    get_person,
                     'other_table': other_database.person_map,                  
                     },
         'Family' : {'table' :  database.family_map,
@@ -216,3 +226,37 @@ def import_table(id_table,add_obj,find_next_gramps_id,
             obj.gramps_id = gramps_id
         add_obj(obj,trans)
         uc.update()
+
+def remap_name_formats(database,other_database):
+    formats_map = {}
+    taken_numbers = [num for (num,name,fmt_str,active)
+                     in database.name_formats]
+    for (number,name,fmt_str,act) in other_database.name_formats:
+        if number in taken_numbers:
+            new_number = -1
+            while new_number in taken_numbers:
+                new_number -= 1
+            taken_numbers.append(new_number)
+            formats_map[number] = new_number
+        else:
+            new_number = number
+        database.name_formats.append((new_number,name,fmt_str,act))
+    return formats_map
+
+def remap_name(person,formats_map):
+    for name in [person.primary_name] + person.alternate_names:
+        try:
+            name.sort_as = formats_map[name.sort_as]
+        except KeyError:
+            pass
+        try:
+            name.display_as = formats_map[name.display_as]
+        except KeyError:
+            pass
+
+def make_peron_name_remapper(other_database,formats_map):
+    def new_get_person(handle):
+        person = other_database.get_person_from_handle(handle)
+        remap_name(person,formats_map)
+        return person
+    return new_get_person
diff --git a/gramps2/src/GrampsDb/_ReadXML.py b/gramps2/src/GrampsDb/_ReadXML.py
index 452c70ce5..f07f64bf4 100644
--- a/gramps2/src/GrampsDb/_ReadXML.py
+++ b/gramps2/src/GrampsDb/_ReadXML.py
@@ -329,6 +329,12 @@ class GrampsParser(UpdateCallback):
         self.smap = {}
         self.lmap = {}
         self.media_file_map = {}
+
+        # List of new name formats and a dict for remapping them
+        self.name_formats  = []
+        self.name_formats_map = {}
+        self.taken_name_format_numbers = [num for (num,name,fmt_str,active)
+                                          in self.db.name_formats]
         
         self.event = None
         self.eventref = None
@@ -611,6 +617,12 @@ class GrampsParser(UpdateCallback):
         self.p.CharacterDataHandler = self.characters
         self.p.ParseFile(file)
 
+        if len(self.name_formats) > 0:
+            # add new name formats to the existing table
+            self.db.name_formats += self.name_formats
+            # Register new formats
+            NameDisplay.displayer.register_custom_formats(self.db.name_formats)
+
         self.db.set_researcher(self.owner)
         if self.home != None:
             person = self.db.find_person_from_handle(self.home,self.trans)
@@ -845,8 +857,26 @@ class GrampsParser(UpdateCallback):
         name = attrs['name']
         fmt_str = attrs['fmt_str']
         active = bool(attrs.get('active',True))
-        self.db.name_formats.append((number,name,fmt_str,active))
 
+        if number in self.taken_name_format_numbers:
+            number = self.remap_name_format(number)
+
+        self.name_formats.append((number,name,fmt_str,active))
+
+    def remap_name_format(self,old_number):
+        if self.name_formats_map.has_key(old_number): # This should not happen
+            return self.name_formats_map[old_number]
+        # Find the lowest new number not taken yet:
+        new_number = -1
+        while new_number in self.taken_name_format_numbers:
+            new_number -= 1
+        # Add this to the taken list
+        self.taken_name_format_numbers.append(new_number)
+        # Set up the mapping entry
+        self.name_formats_map[old_number] = new_number
+        # Return new number
+        return new_number
+        
     def start_person(self,attrs):
         self.update(self.p.CurrentLineNumber)
         new_id = self.map_gid(attrs['id'])
@@ -1025,8 +1055,19 @@ class GrampsParser(UpdateCallback):
             self.name.set_private = bool(attrs.get("priv"))
             self.alt_name = bool(attrs.get("alt"))
             try:
-                self.name.sort_as = int(attrs["sort"])
-                self.name.display_as = int(attrs["display"])
+                sort_as = int(attrs["sort"])
+                display_as = int(attrs["display"])
+
+                # check if these pointers need to be remapped
+                # and set the name attributes
+                if self.name_formats_map.has_key(sort_as):
+                    self.name.sort_as = self.name_formats_map[sort_as]
+                else:
+                    self.name.sort_as = sort_as
+                if self.name_formats_map.has_key(display_as):
+                    self.name.sort_as = self.name_formats_map[display_as]
+                else:
+                    self.name_display_as = display_as
             except KeyError:
                 pass
 
diff --git a/gramps2/src/GrampsDb/_WriteXML.py b/gramps2/src/GrampsDb/_WriteXML.py
index 860e4e5c7..fa405fa7f 100644
--- a/gramps2/src/GrampsDb/_WriteXML.py
+++ b/gramps2/src/GrampsDb/_WriteXML.py
@@ -230,6 +230,10 @@ class XmlWriter(UpdateCallback):
         self.g.write("    </researcher>\n")
         self.g.write("  </header>\n")
 
+        # First write name formats: we need to know all formats
+        # by the time we get to person's names
+        self.write_name_formats()
+
         if event_len > 0:
             self.g.write("  <events>\n")
             sorted_keys = self.db.get_gramps_ids(EVENT_KEY)
@@ -310,9 +314,6 @@ class XmlWriter(UpdateCallback):
         # Data is written, now write bookmarks.
         self.write_bookmarks()
 
-        # Also write name formats
-        self.write_name_formats()
-
         self.g.write("</database>\n")
 
     def write_bookmarks(self):