diff --git a/Kbuild b/Kbuild
index a39cb2b..d2e04ae 100644
--- a/Kbuild
+++ b/Kbuild
@@ -47,7 +47,9 @@
 	# Need to explicitly configure for Android-based builds
 
 	ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP),y)
-	CONFIG_BUILD_TIMESTAMP := y
+	ifneq ($(WLAN_DISABLE_BUILD_TAG),y)
+	CONFIG_BUILD_TAG := y
+	endif
 	endif
 
 	ifeq ($(CONFIG_ARCH_MDM9630), y)
@@ -2266,8 +2268,14 @@
 endif
 
 # inject some build related information
-ifeq ($(CONFIG_BUILD_TIMESTAMP), y)
-CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
+ifeq ($(CONFIG_BUILD_TAG), y)
+CLD_ID = $(shell cd "$(WLAN_ROOT)" && \
+	git log -1 | sed -nE 's/.*Change-Id: (I[0-f]{10}).*/\1/p')
+CMN_ID = $(shell cd "$(WLAN_COMMON_INC)" && \
+	git log -1 | sed -nE 's/.*Change-Id: (I[0-f]{10}).*/\1/p')
+TIMESTAMP = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+BUILD_TAG = "$(TIMESTAMP); cld:$(CLD_ID); cmn:$(CMN_ID);"
+CDEFINES += -DBUILD_TAG=\"$(BUILD_TAG)\"
 endif
 
 # Module information used by KBuild framework