diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82ce8f6f3..3c92ee5ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The deprecated `RecvFile`, `SendFile`, and `SendRawFd` functions have been
   removed from `libcontainer/utils`. (#5227, #5231, #5495)
 
+### Removed ###
+- The deprecated `EXTRA_BUILDTAGS` make variable has been removed, and setting
+  it is now an error. Use `RUNC_BUILDTAGS` instead. (#5171, #5198, #5511)
+
 ### Fixed ###
 - The poststart hooks are now executed after starting the user-specified
   process, fixing a runtime-spec conformance issue. (#4347, #5186)
diff --git a/Makefile b/Makefile
index d293fd44e..3e078fce9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,9 @@ RUNC_BUILDTAGS ?=
 BUILDTAGS_REMOVE := $(patsubst -%,%,$(filter -%,$(RUNC_BUILDTAGS)))
 BUILDTAGS_ADD    := $(filter-out -%,$(RUNC_BUILDTAGS))
 BUILDTAGS := $(filter-out $(BUILDTAGS_REMOVE),$(BUILDTAGS)) $(BUILDTAGS_ADD)
-# TODO: remove EXTRA_BUILDTAGS for runc 1.6.
+# TODO: remove EXTRA_BUILDTAGS check for runc 1.8.
 ifdef EXTRA_BUILDTAGS
-  $(warning EXTRA_BUILDTAGS is deprecated; use RUNC_BUILDTAGS instead)
-  BUILDTAGS += $(EXTRA_BUILDTAGS)
+  $(error EXTRA_BUILDTAGS has been removed; use RUNC_BUILDTAGS instead)
 endif
 
 COMMIT := $(shell git describe --dirty --long --always)