diff --git a/.travis.yml b/.travis.yml
index 3391bd5..841b219 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 # this should be exactly the same as what's in the Dockerfile
-go: 1.3
+go: 1.4
 
 # let us have pretty experimental Docker-based Travis workers
 sudo: false
diff --git a/Dockerfile b/Dockerfile
index 89066ca..a5a19eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 # Dockerfile to cross compile boot2docker-cli
 
-FROM golang:1.3-cross
+FROM golang:1.4-cross
 
 WORKDIR /go/src/github.com/boot2docker/boot2docker-cli
 
 # Download (but not install) dependencies
 RUN go get -v github.com/BurntSushi/toml
-RUN go get -v github.com/ogier/pflag 
+RUN go get -v github.com/ogier/pflag
 
 ADD . /go/src/github.com/boot2docker/boot2docker-cli