diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c1277c231bdad926ce9091d14d604e7e49e28b..2204f2a74fac79532c6f2819a0d6ed8beadc8d87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ variables:
   DL_URL_FRAG: -/jobs/artifacts/master/raw/release/
   SERVER_URL: $PRIVATEGRITY_REPOS/server/$DL_URL_FRAG/server.linux64?job=build
   CLIENT_URL: $PRIVATEGRITY_REPOS/client/$DL_URL_FRAG/client.linux64?job=build
+  CHANNELBOT_URL: $PRIVATEGRITY_REPOS/channelbot/$DL_URL_FRAG/channelbot.linux64?job=build
 
 before_script:
   ##
@@ -48,6 +49,8 @@ installbinaries:
     - chmod +x bin/server
     - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/client $CLIENT_URL"
     - chmod +x bin/client
+    - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/channelbot $CHANNELBOT_URL"
+    - chmod +x bin/channelbot
     - echo $PWD
     - find bin/ -type f -exec file {} \;
   artifacts:
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 2f5f514693192607e4fd557cc0e6056399656f78..dd440cdcf789628d5f059510a32ad529de307794 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -90,7 +90,7 @@ runclients() {
 }
 
 # Start a channelbot server
-CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
+CHANNELCMD="../bin/channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
 eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6739162e7c4620ee93bcaf4bb67d4bd06996ac03
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This intended for manually running the integration tests on your own machine
+# and assumes that you've cloned the Go repos to your GOPATH and updated them
+# with Glide.
+
+pushd $GOPATH/src/gitlab.com/privategrity/client
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/client/client bin
+
+pushd $GOPATH/src/gitlab.com/privategrity/server
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/server/server bin
+
+pushd $GOPATH/src/gitlab.com/privategrity/channelbot
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/channelbot/channelbot bin