diff --git a/gramps2/doc/grampsxml.dtd b/gramps2/doc/grampsxml.dtd
index 0fbc78510..af62edaa9 100644
--- a/gramps2/doc/grampsxml.dtd
+++ b/gramps2/doc/grampsxml.dtd
@@ -52,7 +52,7 @@ DATABASE
 
 <!ELEMENT database (header, people?, families?, sources?, places?, objects?, 
                     bookmarks?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.0.0/">
 
 <!--	************************************************************
 HEADER
diff --git a/gramps2/doc/grampsxml.rng b/gramps2/doc/grampsxml.rng
index a289e0d9f..eb28af1e4 100644
--- a/gramps2/doc/grampsxml.rng
+++ b/gramps2/doc/grampsxml.rng
@@ -31,7 +31,7 @@
 
 <grammar
   datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/"
+  ns="http://gramps-project.org/xml/1.0.0/"
   xmlns="http://relaxng.org/ns/structure/1.0">
 
   <start><element name="database">
diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py
index e1a3c0e20..1eb39169c 100644
--- a/gramps2/src/WriteXML.py
+++ b/gramps2/src/WriteXML.py
@@ -209,10 +209,11 @@ class XmlWriter:
 
         self.g.write('<?xml version="1.0" encoding="UTF-8"?>\n')
         self.g.write('<!DOCTYPE database '
-                     'PUBLIC "-//GRAMPS//DTD GRAMPS XML V%s//EN"\n'
+                     'PUBLIC "-//GRAMPS//DTD GRAMPS XML %s//EN"\n'
                      '"http://gramps-project.org/xml/%s/grampsxml.dtd">\n'
                      % (_xml_version,_xml_version))
-        self.g.write("<database xmlns=\"http://gramps-project.org/\">\n")
+        self.g.write('<database xmlns="http://gramps-project.org/xml/%s/">\n'
+                     % _xml_version)
         self.g.write("  <header>\n")
         self.g.write('    <created date="%04d-%02d-%02d\"' %
                      (date[0],date[1],date[2]) )