diff --git a/.circleci/config.yml b/.circleci/config.yml
index e28a4d3a2..13ede61b9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,10 +13,10 @@ jobs:
     - run:
         name: Cross-compile rclone
         command: |
-            docker pull billziss/xgo-cgofuse
+            docker pull rclone/xgo-cgofuse
             go get -v github.com/karalabe/xgo
             xgo \
-                --image=billziss/xgo-cgofuse \
+                --image=rclone/xgo-cgofuse \
                 --targets=darwin/386,darwin/amd64,linux/386,linux/amd64,windows/386,windows/amd64 \
                 -tags cmount \
                 .
diff --git a/bin/build-xgo-cgofuse.sh b/bin/build-xgo-cgofuse.sh
new file mode 100755
index 000000000..8e4c0259e
--- /dev/null
+++ b/bin/build-xgo-cgofuse.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+docker build -t rclone/xgo-cgofuse https://github.com/billziss-gh/cgofuse.git
+docker images
+docker push rclone/xgo-cgofuse