diff --git a/docs/valadoc/Makefile.am b/docs/valadoc/Makefile.am
index a66aac24c889ac1e8325897817e976e01e6c1ae3..da0c37c483be5075ab83dae7f75eab2ed7ea4038 100644
--- a/docs/valadoc/Makefile.am
+++ b/docs/valadoc/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=
+
 # inspired by folks' documentation Makefile.am
 
 # distclean_dirs? 
diff --git a/gxml/BackedNode.vala b/gxml/BackedNode.vala
index d0e0dc5ea6501088c8a803f4b025436a75d8869f..c681773261f95898295c803e2959069f03718567 100644
--- a/gxml/BackedNode.vala
+++ b/gxml/BackedNode.vala
@@ -104,14 +104,14 @@ namespace GXml {
 		{
 			for (Xml.Ns *cur = node->ns_def; cur != null; cur = cur->next) {
 				if ((string) cur->prefix == prefix && (string) cur->href == uri) {
-					this.node->ns = cur;
+					node->set_ns (cur);
 					return true;
 				}
 			}
 			// Not found in this node, searching on root element
 			for (Xml.Ns *cur = owner_document.document_element.node->ns_def; cur != null; cur = cur->next) {
 				if ((string) cur->prefix == prefix && (string) cur->href == uri) {
-					this.node->ns = cur;
+					this.node->set_ns (cur);
 					return true;
 				}
 			}
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 5e7b946adb27764c7a2a979e7117107510289cb6..c4382b0ebb80fac3daf60a21fed2a090ba8f94e2 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -31,6 +31,7 @@ class GXmlTest {
 		NodeTest.add_tests ();
 		ElementTest.add_tests ();
 		AttrTest.add_tests ();
+		NamespaceTest.add_tests ();
 		NodeListTest.add_tests ();
 		TextTest.add_tests ();
 		CharacterDataTest.add_tests ();
diff --git a/test/Makefile.am b/test/Makefile.am
index 648eb69f56e81dc1e539afd87c7f6bd6ce03fc10..e628b101f01c5cb1bb845663410cb14874e389a7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,6 +31,7 @@ sources = \
 	NodeTest.vala \
 	ElementTest.vala \
 	GXmlTest.vala \
+	NamespaceTest.vala \
 	NodeListTest.vala \
 	TextTest.vala \
 	ValaLibxml2Test.vala \