diff --git a/README.md b/README.md
index c917f02b3..543556d68 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ It supports several backends ([Docker :whale:](https://www.docker.com/), [Mesos/
 - SSL frontend support
 - Clean AngularJS Web UI
 - Websocket support
+- HTTP/2 support
 
 ## Demo
 
diff --git a/build.Dockerfile b/build.Dockerfile
index eb9532d6c..a80241b1c 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.3
+FROM golang:1.6
 
 RUN go get github.com/Masterminds/glide
 RUN go get github.com/mitchellh/gox