diff --git a/Makefile b/Makefile
index 1440f839..0ca67bdf 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,14 @@ RELEASE_CYCLE := alpha
 # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16
 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly
 # on a tagged version).
-_GIT_DESCRIPTION_OR_TAG := $(subst v${VERSION}-,,$(shell git describe --tag --dirty --always))
+_GIT_DESCRIPTION_OR_TAG := $(subst v${VERSION}-,,$(shell git describe --tag --dirty --always --abbrev=9))
 # In the above cases, GITHASH is either `16-123abc` (in the same case above) or
 # `123abc` (when the tag matches the current commit exactly) or `dirty` (when
 # the tag matches the current commit exactly, and there are subsequent
 # uncommitted changes). This is done to prevent repetition of the same tag
 # in the "extended version" of Flamenco, which combines ${VERSION} and
 # ${GITHASH}.
-GITHASH := $(subst v${VERSION},$(shell git rev-parse --short HEAD),${_GIT_DESCRIPTION_OR_TAG})
+GITHASH := $(subst v${VERSION},$(shell git rev-parse --short=9 HEAD),${_GIT_DESCRIPTION_OR_TAG})
 
 LDFLAGS := ${LDFLAGS} -X ${PKG}/internal/appinfo.ApplicationVersion=${VERSION} \
 	-X ${PKG}/internal/appinfo.ApplicationGitHash=${GITHASH} \