diff --git a/src/pkg/html/parse.go b/src/pkg/html/parse.go
index 7077612e7a1..43c04727ab8 100644
--- a/src/pkg/html/parse.go
+++ b/src/pkg/html/parse.go
@@ -243,10 +243,9 @@ func (p *parser) addText(text string) {
 // addElement calls addChild with an element node.
 func (p *parser) addElement(tag string, attr []Attribute) {
 	p.addChild(&Node{
-		Type:      ElementNode,
-		Data:      tag,
-		Namespace: p.top().Namespace,
-		Attr:      attr,
+		Type: ElementNode,
+		Data: tag,
+		Attr: attr,
 	})
 }
 
@@ -1736,7 +1735,9 @@ func parseForeignContent(p *parser) bool {
 			panic("html: bad parser state: unexpected namespace")
 		}
 		adjustForeignAttributes(p.tok.Attr)
+		namespace := p.top().Namespace
 		p.addElement(p.tok.Data, p.tok.Attr)
+		p.top().Namespace = namespace
 	case EndTagToken:
 		for i := len(p.oe) - 1; i >= 0; i-- {
 			if p.oe[i].Namespace == "" {
diff --git a/src/pkg/html/parse_test.go b/src/pkg/html/parse_test.go
index 91c8388b3a2..c929c257727 100644
--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -184,7 +184,7 @@ func TestParser(t *testing.T) {
 		{"tests4.dat", -1},
 		{"tests5.dat", -1},
 		{"tests6.dat", -1},
-		{"tests10.dat", 31},
+		{"tests10.dat", 33},
 	}
 	for _, tf := range testFiles {
 		f, err := os.Open("testdata/webkit/" + tf.filename)