diff --git a/Kbuild b/Kbuild
index 7f9c38a1ad6e..3ab60d9b0cda 100644
--- a/Kbuild
+++ b/Kbuild
@@ -3616,8 +3616,12 @@ CMN_IDS = $(shell cd "$(WLAN_COMMON_INC)" && \
 	git log -50 $(CMN_CHECKOUT)~..HEAD | \
 		sed -nE 's/^\s*Change-Id: (I[0-f]{10})[0-f]{30}\s*$$/\1/p' | \
 		paste -sd "," -)
-
-TIMESTAMP = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+# date -u +'%F %T.%6N %Z'
+#	%F  : Full date
+#	%T  : Time
+#	%6N : Nanoseconds to 6 digits
+#	%Z  : Time zone
+TIMESTAMP = $(shell date -u +'%F %T.%6N %Z')
 BUILD_TAG = "$(TIMESTAMP); cld:$(CLD_IDS); cmn:$(CMN_IDS);"
 # It's assumed that BUILD_TAG is used only in wlan_hdd_main.c
 CFLAGS_wlan_hdd_main.o += -DBUILD_TAG=\"$(BUILD_TAG)\"