diff --git a/clients/go/cammount/.gitignore b/cmd/cammount/.gitignore
similarity index 100%
rename from clients/go/cammount/.gitignore
rename to cmd/cammount/.gitignore
diff --git a/clients/go/cammount/main.go b/cmd/cammount/cammount.go
similarity index 100%
rename from clients/go/cammount/main.go
rename to cmd/cammount/cammount.go
diff --git a/dev-cammount b/dev-cammount
index 64ee7d8f1..39a790da5 100755
--- a/dev-cammount
+++ b/dev-cammount
@@ -6,12 +6,15 @@ set -e
 DIR=/tmp/cammount-dir
 mkdir -p $DIR
 
-./build.pl cammount
+go install ./cmd/cammount/
 
-(fusermount -u $DIR) || true
-clients/go/cammount/cammount --blobserver=localhost:3179/bs --password=pass3179 $@ $DIR &
+(fusermount -u $DIR) || umount $DIR || umount -f $DIR || true
+
+cammount --blobserver=localhost:3179/bs $@ $DIR &
 sleep 1
 cd $DIR
 bash
 cd /
-fusermount -u $DIR
+
+fusermount -u $DIR || umount $DIR || umount -f $DIR || true
+