diff --git a/build-without-openssl.bash b/build-without-openssl.bash
index 670832a..6b7917f 100755
--- a/build-without-openssl.bash
+++ b/build-without-openssl.bash
@@ -4,4 +4,5 @@ set -eu
 
 cd "$(dirname "$0")"
 
+export CGO_ENABLED=0
 exec ./build.bash -tags without_openssl
diff --git a/build.bash b/build.bash
index ebf1888..fd3afb6 100755
--- a/build.bash
+++ b/build.bash
@@ -47,7 +47,7 @@ else
 	# Go 1.5 wants an "=" here
 	go build -ldflags="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildTime=$BUILDTIME" $@
 fi
-(cd gocryptfs-xray; go build)
+(cd gocryptfs-xray; go build $@)
 
 ./gocryptfs -version