diff --git a/api.go b/api.go
index 5662cc2..3b74b0b 100644
--- a/api.go
+++ b/api.go
@@ -60,7 +60,8 @@ func main() {
 	r.Handle("/sessions/{sessionId}/ws/", server)
 
 	// Reverse proxy
-	r.Host(`{node}.{session}.play-with-docker.com`).Handler(handlers.NewMultipleHostReverseProxy())
+	r.Host(`{node}-{port:[0-9]*}.play-with-docker.com`).Handler(handlers.NewMultipleHostReverseProxy())
+	r.Host(`{node}.play-with-docker.com`).Handler(handlers.NewMultipleHostReverseProxy())
 
 	n := negroni.Classic()
 	n.UseHandler(r)
diff --git a/handlers/reverseproxy.go b/handlers/reverseproxy.go
index e708b69..de94af8 100644
--- a/handlers/reverseproxy.go
+++ b/handlers/reverseproxy.go
@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"fmt"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -13,6 +14,10 @@ func NewMultipleHostReverseProxy() *httputil.ReverseProxy {
 	director := func(req *http.Request) {
 		v := mux.Vars(req)
 		node := v["node"]
+		port := v["port"]
+		if port == "" {
+			port = "80"
+		}
 		if strings.HasPrefix(node, "ip") {
 			// Node is actually an ip, need to convert underscores by dots.
 			ip := strings.Replace(strings.TrimPrefix(node, "ip"), "_", ".", -1)
@@ -24,13 +29,10 @@ func NewMultipleHostReverseProxy() *httputil.ReverseProxy {
 			}
 		}
 
-		// Validate that the node actually exists in the network
-		// TODO:
-
 		// Only proxy http for now
 		req.URL.Scheme = "http"
 
-		req.URL.Host = node
+		req.URL.Host = fmt.Sprintf("%s:%s", node, port)
 	}
 
 	return &httputil.ReverseProxy{Director: director}