diff --git a/drivers/btrfs/version.go b/drivers/btrfs/version.go
index 73d90cdd71..a5365b898e 100644
--- a/drivers/btrfs/version.go
+++ b/drivers/btrfs/version.go
@@ -1,4 +1,4 @@
-// +build linux,!btrfs_noversion
+// +build linux,btrfs_version
 
 package btrfs
 
diff --git a/drivers/btrfs/version_none.go b/drivers/btrfs/version_none.go
index f802fbc629..03d34bd795 100644
--- a/drivers/btrfs/version_none.go
+++ b/drivers/btrfs/version_none.go
@@ -1,4 +1,4 @@
-// +build linux,btrfs_noversion
+// +build linux,!btrfs_version
 
 package btrfs
 
diff --git a/drivers/btrfs/version_test.go b/drivers/btrfs/version_test.go
index 15a6e75cb3..88e6dcc371 100644
--- a/drivers/btrfs/version_test.go
+++ b/drivers/btrfs/version_test.go
@@ -1,4 +1,4 @@
-// +build linux,!btrfs_noversion
+// +build linux,btrfs_version
 
 package btrfs
 
diff --git a/hack/make.sh b/hack/make.sh
index 7d115a74b4..f2fbf4e390 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -91,21 +91,21 @@ if [ "$EXPERIMENTAL" ]; then
 	BUILDTAGS+=" experimental"
 fi
 
-# test whether "btrfs/version.h" exists and apply btrfs_noversion appropriately
+# test whether "btrfs/version.h" exists and apply btrfs_version appropriately
 if \
 	command -v gcc &> /dev/null \
-	&& ! gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
+	&& gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
 ; then
-	BUILDTAGS+=' btrfs_noversion'
+	BUILDTAGS+=' btrfs_version'
 fi
 
 # test whether "libdevmapper.h" is new enough to support deferred remove
 # functionality.
 if \
 	command -v gcc &> /dev/null \
-	&& ! ( echo -e  '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \
+	&& ( echo -e  '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \
 ; then
-       BUILDTAGS+=' libdm_no_deferred_remove'
+       BUILDTAGS+=' libdm_deferred_remove'
 fi
 
 # Use these flags when compiling the tests and final binary
diff --git a/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_deferred_remove.go
index dc361eab76..3a781478c6 100644
--- a/pkg/devicemapper/devmapper_wrapper_deferred_remove.go
+++ b/pkg/devicemapper/devmapper_wrapper_deferred_remove.go
@@ -1,4 +1,4 @@
-// +build linux,!libdm_no_deferred_remove
+// +build linux,libdm_deferred_remove
 
 package devicemapper
 
diff --git a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
index 4a6665de86..6793583011 100644
--- a/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
+++ b/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
@@ -1,8 +1,8 @@
-// +build linux,libdm_no_deferred_remove
+// +build linux,!libdm_deferred_remove
 
 package devicemapper
 
-// LibraryDeferredRemovalsupport is not supported when statically linked.
+// LibraryDeferredRemovalSupport is not supported when statically linked.
 const LibraryDeferredRemovalSupport = false
 
 func dmTaskDeferredRemoveFct(task *cdmTask) int {