diff --git a/Makefile b/Makefile
index 0b199a5..0053c74 100644
--- a/Makefile
+++ b/Makefile
@@ -120,13 +120,17 @@ bin-pkcs11: BUILD_ARGS += -tags pkcs11
 bin-pkcs11: CGO_ENABLED = 1
 bin-pkcs11: bin
 
+bin-fips140: GOENV += GOFIPS140=v1.0.0
+bin-fips140: LDFLAGS += -checklinkname=0
+bin-fips140: bin
+
 bin:
-	go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" -o ./nebula${NEBULA_CMD_SUFFIX} ${NEBULA_CMD_PATH}
-	go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" -o ./nebula-cert${NEBULA_CMD_SUFFIX} ./cmd/nebula-cert
+	$(GOENV) go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" -o ./nebula${NEBULA_CMD_SUFFIX} ${NEBULA_CMD_PATH}
+	$(GOENV) go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" -o ./nebula-cert${NEBULA_CMD_SUFFIX} ./cmd/nebula-cert
 
 install:
-	go install $(BUILD_ARGS) -ldflags "$(LDFLAGS)" ${NEBULA_CMD_PATH}
-	go install $(BUILD_ARGS) -ldflags "$(LDFLAGS)" ./cmd/nebula-cert
+	$(GOENV) go install $(BUILD_ARGS) -ldflags "$(LDFLAGS)" ${NEBULA_CMD_PATH}
+	$(GOENV) go install $(BUILD_ARGS) -ldflags "$(LDFLAGS)" ./cmd/nebula-cert
 
 build/linux-arm-%: GOENV += GOARM=$(word 3, $(subst -, ,$*))
 build/linux-mips-%: GOENV += GOMIPS=$(word 3, $(subst -, ,$*))
diff --git a/noiseutil/fips140.go b/noiseutil/fips140.go
index 2414f52..d4e2f71 100644
--- a/noiseutil/fips140.go
+++ b/noiseutil/fips140.go
@@ -1,5 +1,5 @@
-//go:build fips140
-// +build fips140
+//go:build fips140v1.0
+// +build fips140v1.0
 
 package noiseutil
 
diff --git a/noiseutil/fips140_test.go b/noiseutil/fips140_test.go
index 9abcb20..ead15e4 100644
--- a/noiseutil/fips140_test.go
+++ b/noiseutil/fips140_test.go
@@ -1,5 +1,5 @@
-//go:build fips140
-// +build fips140
+//go:build fips140v1.0
+// +build fips140v1.0
 
 package noiseutil
 
diff --git a/noiseutil/notboring.go b/noiseutil/notboring.go
index 9277969..ee3033a 100644
--- a/noiseutil/notboring.go
+++ b/noiseutil/notboring.go
@@ -1,5 +1,5 @@
-//go:build !boringcrypto && !fips140
-// +build !boringcrypto,!fips140
+//go:build !boringcrypto && !fips140v1.0
+// +build !boringcrypto,!fips140v1.0
 
 package noiseutil
 
diff --git a/noiseutil/notboring_test.go b/noiseutil/notboring_test.go
index 2d44bf8..767fc66 100644
--- a/noiseutil/notboring_test.go
+++ b/noiseutil/notboring_test.go
@@ -1,5 +1,5 @@
-//go:build !boringcrypto && !fips140
-// +build !boringcrypto,!fips140
+//go:build !boringcrypto && !fips140v1.0
+// +build !boringcrypto,!fips140v1.0
 
 package noiseutil