diff --git a/_examples/reflect/reflect.go b/_examples/reflect/reflect.go
index 1f31ecaf..33ef530f 100644
--- a/_examples/reflect/reflect.go
+++ b/_examples/reflect/reflect.go
@@ -68,20 +68,19 @@ func handleReflect(w dns.ResponseWriter, r *dns.Msg) {
 	w.Write(b)
 }
 
+func serve(net string) {
+        err := dns.ListenAndServe(":8053", net, nil)
+        if err != nil {
+                fmt.Printf("Failed to setup the " + net + " server: %s", err.String())
+        }
+}
+
 func main() {
 	dns.HandleFunc(".", handleReflect)
-        go func() {
-                err := dns.ListenAndServe(":8053", "udp", nil)
-                if err != nil {
-                        fmt.Printf("Failed to setup the udp server")
-                }
-        }()
-        go func() {
-                err := dns.ListenAndServe(":8053", "tcp", nil)
-                if err != nil {
-                        fmt.Printf("Failed to setup the tcp server")
-                }
-        }()
+        go serve("udp4")
+        go serve("udp6")
+        go serve("tcp4")
+        go serve("tcp6")
 forever:
         for {
                 select {
diff --git a/server.go b/server.go
index 7d97d05e..1dc29f9f 100644
--- a/server.go
+++ b/server.go
@@ -170,47 +170,29 @@ type Server struct {
 	WriteTimeout int64   // the net.Conn.SetWriteTimeout value for new connections
 }
 
-// Serve accepts incoming DNS request on the TCP listener l,
-// creating a new service thread for each.  The service threads
-// read requests and then call handler to reply to them.
-// Handler is typically nil, in which case the DefaultServeMux is used.
-func ServeTCP(l *net.TCPListener, handler Handler) os.Error {
-	srv := &Server{Handler: handler, Net: "tcp"}
-	return srv.ServeTCP(l)
-}
-
-// Serve accepts incoming DNS request on the UDP Conn l,
-// creating a new service thread for each.  The service threads
-// read requests and then call handler to reply to them.
-// Handler is typically nil, in which case the DefaultServeMux is used.
-func ServeUDP(l *net.UDPConn, handler Handler) os.Error {
-	srv := &Server{Handler: handler, Net: "udp"}
-	return srv.ServeUDP(l)
-}
-
-// Fixes for udp/tcp
+// ...
 func (srv *Server) ListenAndServe() os.Error {
 	addr := srv.Addr
 	if addr == "" {
 		addr = ":domain"
 	}
 	switch srv.Net {
-	case "tcp":
-		a, e := net.ResolveTCPAddr("tcp", addr)
+	case "tcp", "tcp4", "tcp6":
+		a, e := net.ResolveTCPAddr(srv.Net, addr)
 		if e != nil {
 			return e
 		}
-		l, e := net.ListenTCP("tcp", a)
+		l, e := net.ListenTCP(srv.Net, a)
 		if e != nil {
 			return e
 		}
 		return srv.ServeTCP(l)
-	case "udp":
-		a, e := net.ResolveUDPAddr("udp", addr)
+	case "udp", "udp4", "udp6":
+		a, e := net.ResolveUDPAddr(srv.Net, addr)
 		if e != nil {
 			return e
 		}
-		l, e := net.ListenUDP("udp", a)
+		l, e := net.ListenUDP(srv.Net, a)
 		if e != nil {
 			return e
 		}