--- a/structs.go	Sun Dec 16 17:10:03 2012 -0700
+++ b/structs.go	Sun Dec 16 17:10:21 2012 -0700
@@ -68,13 +68,13 @@
 }
 
 type mechs struct {
-	Mechanism []string
+	Mechanism []string `xml:"urn:ietf:params:xml:ns:xmpp-sasl mechanism"`
 }
 
 type auth struct {
 	XMLName   xml.Name
-	Chardata  string `xml:"chardata"`
-	Mechanism string `xml:"attr"`
+	Chardata  string `xml:",chardata"`
+	Mechanism string `xml:"mechanism,attr"`
 	Any       *Generic
 }