diff --git a/data/grampsxml.dtd b/data/grampsxml.dtd
index 160d4add5..6bd622d3e 100644
--- a/data/grampsxml.dtd
+++ b/data/grampsxml.dtd
@@ -251,7 +251,7 @@ PLACES
 
 <!ELEMENT places (placeobj)*>
 
-<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
+<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
                     objref*, url*, noteref*, citationref*, tagref*)>
 <!ATTLIST placeobj
         id        CDATA #IMPLIED
diff --git a/data/grampsxml.rng b/data/grampsxml.rng
index 4888d331f..9f84a8ebf 100644
--- a/data/grampsxml.rng
+++ b/data/grampsxml.rng
@@ -453,10 +453,10 @@
     <ref name="primary-object"/>
     <attribute name="type"><text/></attribute>
     <optional><element name="ptitle"><text/></element></optional>
+    <optional><element name="code"><text/></element></optional>
     <oneOrMore><element name="pname">
         <ref name="placename-content"/>
     </element></oneOrMore>
-    <optional><element name="code"><text/></element></optional>
     <optional><element name="coord">
         <attribute name="long"><text/></attribute>
         <attribute name="lat"><text/></attribute>