diff --git a/CHANGES b/CHANGES
index 60431dbab68..ed6f3058155 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-# 21.05
+# 21.06
-- Add roctx ranges to TinyProfiler (#2057)
diff --git a/Tools/GNUMake/Make.defs b/Tools/GNUMake/Make.defs
index 504d4eedb17..ae8d7dba243 100644
--- a/Tools/GNUMake/Make.defs
+++ b/Tools/GNUMake/Make.defs
@@ -384,6 +384,9 @@ SKIP_LINKING ?= FALSE
USE_COMPILE_PIC ?= FALSE
AMREX_GIT_VERSION := $(shell cd $(AMREX_HOME); git describe --abbrev=12 --dirty --always --tags)
+ifndef AMREX_GIT_VERSION
+ AMREX_GIT_VERSION := $(shell grep -o -m 1 -E "[0-9]{2}\.[0-9]{2}(\.[0-9]+)?" $(AMREX_HOME)/CHANGES)
+endif
DEFINES += -DAMREX_GIT_VERSION=\"$(AMREX_GIT_VERSION)\"
FORTLINK = UNDERSCORE