diff --git a/ChangeLog b/ChangeLog
index 890a0fa98..174fb9304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-09  Alex Roitman  <shura@gramps-project.org>
+	* data/grampsxml.rng: Add namemaps.
+	* data/grampsxml.dtd: Add namemaps.
+
 2007-12-07 Benny Malengier <benny.malengier@gramps-project.org>
 	Add support for name grouping import/export
 	* src/GrampsDb/_GrampsDbBase.py: obtain grouping keys
diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 301990843..dbced8fd2 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -52,7 +52,8 @@ DATABASE
 -->
 
 <!ELEMENT database (header, name-formats?, events?, people?, families?,
-                    sources?, places?, objects?, repositories?, bookmark?)>
+                    sources?, places?, objects?, repositories?,
+                    bookmarks?, namemaps?)>
 <!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.1.4/">
 
 <!--	************************************************************
@@ -315,6 +316,17 @@ BOOKMARKS
         hlink  IDREF #REQUIRED
 >
 
+<!--	************************************************************
+NAME MAPS
+-->
+<!ELEMENT namemaps (map)*>
+<!ELEMENT map EMPTY>
+<!ATTLIST map 
+        type  CDATA #REUIRED
+        key   CDATA #REQUIRED
+        value CDATA #REQUIRED
+>
+
 <!--	************************************************************
 NAME FORMATS
 -->
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 98107785a..456e47390 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -104,6 +104,11 @@
           </element></zeroOrMore>
       </element></optional>
 
+      <optional><element name="namemaps">
+          <zeroOrMore><element name="map">
+              <ref name="map-content"/>
+          </element></zeroOrMore>
+      </element></optional>
   </element></start>
 
   <define name="researcher-content">
@@ -451,6 +456,14 @@
     <attribute name="hlink"><data type="IDREF"/></attribute>
   </define>
   
+  <define name="map-content">
+    <attribute name="type"><choice>
+        <value>group_as</value>
+    </choice></attribute>
+    <attribute name="key"><text/></attribute>
+    <attribute name="value"><text/></attribute>
+  </define>
+
   <define name="format-content">
     <attribute name="number"><text/></attribute>
     <attribute name="name"><text/></attribute>