diff --git a/README.markdown b/README.markdown
index 90d01c87..b08be757 100644
--- a/README.markdown
+++ b/README.markdown
@@ -55,29 +55,30 @@ All of them:
 * 2181 - RRset definition
 * 2537 - RSAMD5 DNS keys
 * 2065 - DNSSEC (updated in later RFCs)
-* 2671 - EDNS
-* 2782 - SRV
-* 2845 - TSIG
-* 2915 - NAPTR
+* 2671 - EDNS record
+* 2782 - SRV record
+* 2845 - TSIG record
+* 2915 - NAPTR record
 * 3110 - RSASHA1 DNS keys
 * 3225 - DO bit (DNSSEC OK)
-* 340{1,2,3} - NAPTR
+* 340{1,2,3} - NAPTR record
 * 3445 - Limiting the scope of (DNS)KEY
 * 3597 - Unkown RRs
 * 403{3,4,5} - DNSSEC + validation functions
-* 4255 - SSHFP
-* 4408 - SPF
+* 4255 - SSHFP record
+* 4408 - SPF record
 * 4509 - SHA256 Hash in DS
 * 4592 - Wildcards in the DNS
 * 4635 - HMAC SHA TSIG
 * 4701 - DHCID
 * 4892 - id.server
 * 5001 - NSID 
-* 5155 - NSEC3
-* 5205 - HIP
+* 5155 - NSEC3 record
+* 5205 - HIP record
 * 5933 - GOST
 * 5936 - AXFR
 * xxxx - ECDSA
+* xxxx - URI record
 
 ## Loosely based upon:
 
diff --git a/zscan_rr.go b/zscan_rr.go
index 5d0021dd..ce1c31d3 100644
--- a/zscan_rr.go
+++ b/zscan_rr.go
@@ -6,8 +6,6 @@ import (
 	"strings"
 )
 
-// TODO: TKEY, RR_URI, DHCID
-
 // Parse the rdata of each rrtype.
 // All data from the channel c is either _STRING or _BLANK.
 // After the rdata there may come 1 _BLANK and then a _NEWLINE
@@ -1025,6 +1023,57 @@ func setTXT(h RR_Header, c chan lex, f string) (RR, *ParseError) {
 	return rr, nil
 }
 
+func setURI(h RR_Header, c chan lex, f string) (RR, *ParseError) {
+	rr := new(RR_URI)
+	rr.Hdr = h
+
+	l := <-c
+	if i, e := strconv.Atoi(l.token); e != nil {
+		return nil, &ParseError{f, "bad URI Priority", l}
+	} else {
+		rr.Priority = uint16(i)
+	}
+	<-c // _BLANK
+	l = <-c
+	if i, e := strconv.Atoi(l.token); e != nil {
+		return nil, &ParseError{f, "bad URI Weight", l}
+	} else {
+		rr.Weight = uint16(i)
+	}
+	// _BLANK?
+
+	// Get the remaining data until we see a NEWLINE
+	quote := false
+	l = <-c
+	var s string
+	switch l.value == _QUOTE {
+	case true:
+		for l.value != _NEWLINE && l.value != _EOF {
+			switch l.value {
+			case _STRING:
+				s += l.token
+			case _BLANK:
+				if quote {
+					// _BLANK can only be seen in between txt parts.
+					return nil, &ParseError{f, "bad URI Target", l}
+				}
+			case _QUOTE:
+				quote = !quote
+			default:
+				return nil, &ParseError{f, "bad URI Target", l}
+			}
+			l = <-c
+		}
+		if quote {
+			return nil, &ParseError{f, "bad URI Target", l}
+		}
+	case false: // Unquoted
+		return nil, &ParseError{f, "bad URI Target", l}
+	}
+	rr.Target = s
+	return rr, nil
+}
+
 func setIPSECKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
 	rr := new(RR_IPSECKEY)
 	rr.Hdr = h
@@ -1070,11 +1119,11 @@ func setIPSECKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
 }
 
 func setDHCID(h RR_Header, c chan lex, f string) (RR, *ParseError) {
-        // awesome record to parse!
+	// awesome record to parse!
 	rr := new(RR_DHCID)
 	rr.Hdr = h
 
-        l := <-c // _STRING
+	l := <-c // _STRING
 	var s string
 	for l.value != _NEWLINE && l.value != _EOF {
 		switch l.value {