diff --git a/build-cli.sh b/build-cli.sh
index 2be4202a80aace41fe86105b4c6b9b5879fba486..f46e10c6e329ea4661de8d7f5dee022db34e3e1a 100755
--- a/build-cli.sh
+++ b/build-cli.sh
@@ -1,15 +1,19 @@
 #!/bin/sh
+set -e
+DISABLE_QUIC=""
+if [ ! -z "$(go version | grep go1.15)" ]; then DISABLE_QUIC="DISABLE_QUIC"; fi
+
 set -ex
 case $1 in
   darwin)
     export GOOS=darwin GOARCH=amd64
-    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" ./cmd/miniooni;;
+    go build -o ./CLI/darwin/amd64 -ldflags="-s -w" -tags $DISABLE_QUIC ./cmd/miniooni;;
   linux)
     export GOOS=linux GOARCH=amd64
-    go build -o ./CLI/linux/amd64 -tags netgo -ldflags='-s -w -extldflags "-static"' ./cmd/miniooni;;
+    go build -o ./CLI/linux/amd64 -tags $DISABLE_QUIC,netgo -ldflags='-s -w -extldflags "-static"' ./cmd/miniooni;;
   windows)
     export GOOS=windows GOARCH=amd64
-    go build -o ./CLI/windows/amd64 -ldflags="-s -w" ./cmd/miniooni;;
+    go build -o ./CLI/windows/amd64 -tags $DISABLE_QUIC -ldflags="-s -w" ./cmd/miniooni;;
   *)
     echo "usage: $0 darwin|linux|windows" 1>&2
     exit 1
diff --git a/readme_compiletimecheck.go b/readme_compiletimecheck.go
new file mode 100644
index 0000000000000000000000000000000000000000..30f7e3592d32c789c03a8c725fa6c4899d30f2b2
--- /dev/null
+++ b/readme_compiletimecheck.go
@@ -0,0 +1,8 @@
+//+build !DISABLE_QUIC
+//+build go1.15
+
+package engine
+
+
+ATTENTION: If you are compiling probe-engine with go1.15 please make sure
+to pass -tags DISABLE_QUIC. Alternatively use the build script!