diff --git a/.travis.yml b/.travis.yml
index 73c32220..2da35eea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ branches:
 install:
 - go get github.com/mitchellh/gox
 - go get github.com/tools/godep
-- godep restore
+- ./script/godep-restore.sh
 
 script:
 - make binary
diff --git a/script/godep-restore.sh b/script/godep-restore.sh
new file mode 100755
index 00000000..398af3d7
--- /dev/null
+++ b/script/godep-restore.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# inspired by: https://github.com/openshift/origin/blob/master/hack/godep-restore.sh
+
+# Sometimes godep needs 'other' remotes. So add those remotes
+preload-remote() {
+  local orig_org="$1"
+  local orig_project="$2"
+  local alt_org="$3"
+  local alt_project="$4"
+
+  # Go get stinks, which is why we have the || true...
+  go get -d "${orig_org}/${orig_project}" &>/dev/null || true
+
+  repo_dir="${GOPATH}/src/${orig_org}/${orig_project}"
+  pushd "${repo_dir}" > /dev/null
+    git remote add "${alt_org}-remote" "https://${alt_org}/${alt_project}.git" > /dev/null || true
+    git remote update > /dev/null
+  popd > /dev/null
+}
+
+echo "Preloading some dependencies"
+# OpenShift requires its own Kubernets fork :-(
+preload-remote "k8s.io" "kubernetes" "github.com/openshift" "kubernetes"
+
+
+echo "Starting to download all godeps. This takes a while"
+godep restore
+echo "Download finished into ${GOPATH}"