diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index c120a6ab3..00dd07e68 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -119,9 +119,8 @@ GENDER has values of M, F, or U.
 -->
 <!ELEMENT gender  (#PCDATA)>
 
-<!ELEMENT name    (first?, call?, surname*, nick?, familynick?, suffix?, title?,
-                   group?, (daterange|datespan|dateval|datestr)?, noteref*,
-                   citationref*)>
+<!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
+                  (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
 <!ATTLIST name    
         alt       (0|1) #IMPLIED
         type      CDATA #IMPLIED
@@ -165,6 +164,7 @@ GENDER has values of M, F, or U.
 <!ATTLIST address priv (0|1) #IMPLIED>
 
 <!ELEMENT street  (#PCDATA)>
+<!ELEMENT locality (#PCDATA)>
 <!ELEMENT city    (#PCDATA)>
 <!ELEMENT county  (#PCDATA)>
 <!ELEMENT country (#PCDATA)>
@@ -381,7 +381,8 @@ BOOKMARKS
 <!ELEMENT bookmarks (bookmark)*>
 <!ELEMENT bookmark EMPTY>
 <!ATTLIST bookmark 
-        target (person|family|event|source|place|media|repository) #REQUIRED
+        target (person|family|event|source|place|media|repository|
+                note) #REQUIRED
         hlink  IDREF #REQUIRED
 >
 
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index b90c696d1..367e732d3 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -230,6 +230,7 @@
         <ref name="priv-content"/>
     </attribute></optional>
     <optional><attribute name="type"><choice>
+        <value>Unknown</value>
         <value>Also Known As</value>
         <value>Birth Name</value>
         <value>Married Name</value>
@@ -239,9 +240,9 @@
     <optional><attribute name="display"><text/></attribute></optional>
     <optional><element name="first"><text/></element></optional>
     <optional><element name="call"><text/></element></optional>
-    <zeroOrMore>
+    <zeroOrMore><element name="surname">
         <ref name="surname-content"/>
-    </zeroOrMore>
+    </element></zeroOrMore>
     <optional><element name="suffix"><text/></element></optional>
     <optional><element name="title"><text/></element></optional>
     <optional><element name="nick"><text/></element></optional>
@@ -257,21 +258,27 @@
   </define>
 
   <define name="surname-content">
-    <element name="surname">
-        <text/>
-        <optional><attribute name="prefix"><text/></attribute></optional>
-        <optional><attribute name="prim"><choice>
-        <value>1</value>
-        <value>0</value>
-        </choice></attribute></optional>
-        <optional><attribute name="derivation"><choice>
-        <value>inherited</value>
-        <value>patronymic</value>
-        <value>matronymic</value>
-        <value>other</value>
-        </choice></attribute></optional>
-        <optional><attribute name="connector"><text/></attribute></optional>
-    </element>
+    <text/>
+    <optional><attribute name="prefix"><text/></attribute></optional>
+    <optional><attribute name="prim"><choice>
+    <value>1</value>
+    <value>0</value>
+    </choice></attribute></optional>
+    <optional><attribute name="derivation"><choice>
+    <value>Unknown</value>
+    <value>Inherited</value>
+    <value>Given</value>
+    <value>Taken</value>
+    <value>Patronymic</value>
+    <value>Matronymic</value>
+    <value>Feudal</value>
+    <value>Pseudonym</value>
+    <value>Patrilineal</value>
+    <value>Matrilineal</value>
+    <value>Occupation</value>
+    <value>Location</value>
+    </choice></attribute></optional>
+    <optional><attribute name="connector"><text/></attribute></optional>
   </define>
 
   <define name="address-content">
@@ -376,6 +383,12 @@
         <optional><attribute name="frel">
             <ref name="child-rel"/>
         </attribute></optional>
+        <zeroOrMore><element name="citationref">
+            <ref name="citationref-content"/>
+        </element></zeroOrMore>
+        <zeroOrMore><element name="noteref">
+            <ref name="noteref-content"/>
+        </element></zeroOrMore>
     </element></zeroOrMore>
     <zeroOrMore><element name="attribute">
         <ref name="attribute-content"/>
@@ -464,6 +477,7 @@
     </element></optional>
     <zeroOrMore><element name="location">
         <optional><attribute name="street"><text/></attribute></optional>
+        <optional><attribute name="locality"><text/></attribute></optional>
         <optional><attribute name="city"><text/></attribute></optional>
         <optional><attribute name="parish"><text/></attribute></optional>
         <optional><attribute name="county"><text/></attribute></optional>
@@ -532,6 +546,7 @@
         <value>place</value>
         <value>media</value>
         <value>repository</value>
+        <value>note</value>
     </choice></attribute>
     <attribute name="hlink"><data type="IDREF"/></attribute>
   </define>