diff --git a/Makefile.config.in b/Makefile.config.in
index a5a4c69b0..3f086cb44 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -42,7 +42,7 @@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
-COMMIT_ID = @COMMIT_ID@
+CG_COMMIT_ID = @CG_COMMIT_ID@
 CONFDIR = @CONFDIR@
 CONFIG_NLS = @CONFIG_NLS@
 DATADIRNAME = @DATADIRNAME@
diff --git a/configure.in b/configure.in
index a927ce1c7..1e00f9b4d 100644
--- a/configure.in
+++ b/configure.in
@@ -35,7 +35,7 @@ AC_PATH_PROGS(AWK, "$AWK")
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 
-AC_PATH_PROGS(COMMIT_ID, "commit-id")
+AC_PATH_PROGS(CG_COMMIT_ID, "cg-commit-id")
 
 CONFIG_ASCIIDOC="no"
 CONFIG_POD2HTML="no"
diff --git a/src/Makefile b/src/Makefile
index df96707cf..8a8f0ac1f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,8 +84,8 @@ ELINKSLIBS = \
  util/libutil.a
 
 # Get the GIT HEAD ID if possible
-ifdef COMMIT_ID
-BUILD_ID=$(shell $(COMMIT_ID) 2> /dev/null)
+ifdef CG_COMMIT_ID
+BUILD_ID=$(shell $(CG_COMMIT_ID) 2> /dev/null)
 endif
 INCLUDES += -DBUILD_ID="\"$(BUILD_ID)\""