diff --git a/Makefile b/Makefile
index dde09a5..665e96c 100644
--- a/Makefile
+++ b/Makefile
@@ -410,12 +410,11 @@
 
 CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
 
-# versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and
-# imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will
-# be obtained using util/getrevision.sh, which is the common case during development.
--include versioninfo.inc
-VERSION ?= $(shell ./util/getrevision.sh --revision)
-MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null)
+# By default version information will be fetched from Git if available.
+# Otherwise, versioninfo.inc stores the metadata required to build a
+# packaged flashrom. It is generated by the export, tag and branch rules.
+VERSION := $(shell ./util/getversion.sh --version)
+MAN_DATE := $(shell ./util/getversion.sh --man-date)
 
 SCMDEF := -D'FLASHROM_VERSION="$(VERSION)"'