diff --git a/content/xul/templates/src/nsXULTemplateResultXML.cpp b/content/xul/templates/src/nsXULTemplateResultXML.cpp
index 4052bd249813..8383c324d1eb 100644
--- a/content/xul/templates/src/nsXULTemplateResultXML.cpp
+++ b/content/xul/templates/src/nsXULTemplateResultXML.cpp
@@ -51,8 +51,30 @@ NS_IMPL_ISUPPORTS1(nsXULTemplateResultXML, nsIXULTemplateResult)
 nsXULTemplateResultXML::nsXULTemplateResultXML(nsXMLQuery* aQuery,
                                                nsIDOMNode* aNode,
                                                nsXMLBindingSet* aBindings)
-    : mId(++sTemplateId), mQuery(aQuery), mNode(aNode)
+    : mQuery(aQuery), mNode(aNode)
 {
+    nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
+
+    // If the node has an id, create the uri from it. Otherwise, there isn't
+    // anything to identify the node with so just use a somewhat random number.
+    nsCOMPtr<nsIAtom> id = content->GetID();
+    if (id) {
+      nsCOMPtr<nsIURI> uri = content->GetBaseURI();
+      nsCAutoString spec;
+      uri->GetSpec(spec);
+
+      mId = NS_ConvertUTF8toUTF16(spec);
+
+      nsAutoString idstr;
+      id->ToString(idstr);
+      mId += NS_LITERAL_STRING("#") + idstr;
+    }
+    else {
+      nsAutoString rowid(NS_LITERAL_STRING("row"));
+      rowid.AppendInt(++sTemplateId);
+      mId.Assign(rowid);
+    }
+
     if (aBindings)
         mRequiredValues.SetBindingSet(aBindings);
 }
@@ -97,9 +119,7 @@ nsXULTemplateResultXML::GetMayProcessChildren(PRBool* aMayProcessChildren)
 NS_IMETHODIMP
 nsXULTemplateResultXML::GetId(nsAString& aId)
 {
-    nsAutoString rowid(NS_LITERAL_STRING("row"));
-    rowid.AppendInt(mId);
-    aId.Assign(rowid);
+    aId = mId;
     return NS_OK;
 }
 
diff --git a/content/xul/templates/src/nsXULTemplateResultXML.h b/content/xul/templates/src/nsXULTemplateResultXML.h
index 9792ade67b22..73ea80655344 100644
--- a/content/xul/templates/src/nsXULTemplateResultXML.h
+++ b/content/xul/templates/src/nsXULTemplateResultXML.h
@@ -38,6 +38,7 @@
 #define nsXULTemplateResultXML_h__
 
 #include "nsCOMPtr.h"
+#include "nsIURI.h"
 #include "nsIRDFResource.h"
 #include "nsXULTemplateQueryProcessorXML.h"
 #include "nsIXULTemplateResult.h"
@@ -62,8 +63,11 @@ public:
 
 protected:
 
-    // result id
-    PRUint32 mId;
+    // ID used for persisting data. It is constructed using the mNode's
+    // base uri plus the node's id to form 'baseuri#id'. If the node has no
+    // id, then an id of the form 'row<some number>' is generated. In the
+    // latter case, persistence will not work as there won't be a unique id.
+    nsAutoString mId;
 
     // query that generated the result
     nsCOMPtr<nsXMLQuery> mQuery;
diff --git a/content/xul/templates/tests/chrome/animals.xml b/content/xul/templates/tests/chrome/animals.xml
index 1c2723c4f939..f73ec718b1ec 100644
--- a/content/xul/templates/tests/chrome/animals.xml
+++ b/content/xul/templates/tests/chrome/animals.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0"?>
 
+<!DOCTYPE zoo [
+    <!ATTLIST species id ID #REQUIRED>
+]>
+
 <zoo>
   <class>
     <name>Reptiles</name>
-    <species id="Chamaeleo chamaelon" name="Chameleon" specimens="2"/>
+    <species id="Chamaeleo-chamaelon" name="Chameleon" specimens="2"/>
   </class>
   <class>
     <name>Birds</name>
-    <species id="Dromaius novaehollandiae" name="Emu" specimens="12"/>
-    <species id="Tyto alba" name="Barn Owl" specimens="4"/>
-    <species id="Corvus corax" name="Raven" specimens="0"/>
+    <species id="Dromaius-novaehollandiae" name="Emu" specimens="12"/>
+    <species id="Tyto-alba" name="Barn Owl" specimens="4"/>
+    <species id="Corvus-corax" name="Raven" specimens="0"/>
     <location>Aviary</location>
   </class>
 </zoo>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
index fdf968534c35..c2165c6a7604 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
@@ -30,10 +30,10 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <button anyid="true" label="Chameleon 2"/>
-  <button anyid="true" label="Emu 12"/>
-  <button anyid="true" label="Barn Owl 4"/>
-  <button anyid="true" label="Raven 0"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
 </output>;
 
 var changes = [];
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
index 8cc2c4d227ab..3d9a9a5ff14c 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
@@ -30,19 +30,19 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <hbox anyid="true">
+  <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
     <button label="Chameleon"/>
     <label value="9"/>
   </hbox>
-  <hbox anyid="true">
+  <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
     <button label="Emu"/>
     <label value="3"/>
   </hbox>
-  <hbox anyid="true">
+  <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba">
     <button label="Barn Owl"/>
     <label value="8"/>
   </hbox>
-  <hbox anyid="true">
+  <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax">
     <button label="Raven"/>
     <label value="5"/>
   </hbox>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
index 2b5c39513bc8..60ca73095577 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
@@ -30,10 +30,10 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <button anyid="true" label="Chameleon 2"/>
-  <button anyid="true" label="Emu 12"/>
-  <button anyid="true" label="Barn Owl 4"/>
-  <button anyid="true" label="Raven 0"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
 </output>;
 
 var changes = [];
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
index db664318e1ec..40fb9a9f895c 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
@@ -30,10 +30,10 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <button anyid="true" label="(Dromaius novaehollandiae) is a large bird"/>
-  <button anyid="true" label="(Tyto alba) Barn Owl"/>
-  <button anyid="true" label="(Corvus corax) Raven"/>
-  <label anyid="true" value="Chameleon"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="(Dromaius-novaehollandiae) is a large bird"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="(Tyto-alba) Barn Owl"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="(Corvus-corax) Raven"/>
+  <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
 </output>;
 
 var changes = [];
@@ -47,7 +47,7 @@ var changes = [];
 <assign var="?id" expr="concat('(', @id, ')')"/>
 </query>
 <rule>
-<where subject="?id" rel="equals" value="(Dromaius novaehollandiae)"/>
+<where subject="?id" rel="equals" value="(Dromaius-novaehollandiae)"/>
 <action>
 <button uri="?" label="?id is a large bird"/>
 </action>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
index a8f1f87e075d..387780175c99 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
@@ -32,13 +32,13 @@ var expectedOutput =
 <output>
   <groupbox anyid="true" container="true" empty="false">
     <caption label="Reptiles false"/>
-    <label anyid="true" value="Chameleon"/>
+    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
   </groupbox>
   <groupbox anyid="true" container="true" empty="false">
     <caption label="Birds true"/>
-    <label anyid="true" value="Emu"/>
-    <label anyid="true" value="Barn Owl"/>
-    <label anyid="true" value="Raven"/>
+    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" value="Emu"/>
+    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" value="Barn Owl"/>
+    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" value="Raven"/>
   </groupbox>
 </output>;
 
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
index cfda16138f56..eae6456d27bc 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
@@ -30,10 +30,10 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <button anyid="true" label="Barn Owl"/>
-  <button anyid="true" label="Chameleon"/>
-  <button anyid="true" label="Emu"/>
-  <button anyid="true" label="Raven"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
 </output>;
 
 var changes = [];
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
index efa2cac1e1a7..67ea6b2d22bf 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
+++ b/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
@@ -30,10 +30,10 @@ var notWorkingYet = false;
 var notWorkingYetDynamic = false;
 var expectedOutput =
 <output>
-  <button anyid="true" label="Barn Owl"/>
-  <button anyid="true" label="Emu"/>
-  <button anyid="true" label="Raven"/>
-  <button anyid="true" label="Chameleon"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
+  <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
 </output>;
 
 var changes = [];