diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk
index 4b40928514..afa66abd7d 100644
--- a/mk/px4_targets.mk
+++ b/mk/px4_targets.mk
@@ -26,6 +26,12 @@ ifeq ($(wildcard $(NUTTX_SRC)configs),)
 $(error ERROR: NUTTX_SRC not set correctly - no configs directory found)
 endif
 
+NUTTX_GIT_VERSION := $(shell cd $(NUTTX_SRC) && git rev-parse HEAD | cut -c1-8)
+PX4_GIT_VERSION   := $(shell cd $(PX4_ROOT) && git rev-parse HEAD | cut -c1-8)
+
+EXTRAFLAGS += -DNUTTX_GIT_VERSION="\"$(NUTTX_GIT_VERSION)\""
+EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\""
+
 # we have different config files for V1 and V2
 PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk
 PX4_V2_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v2_APM.mk