diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk
index a809f8aa5b..9799bd7dae 100644
--- a/firmware/rusefi.mk
+++ b/firmware/rusefi.mk
@@ -1,6 +1,14 @@
 
 ifeq ("$(wildcard $(RULESFILE))","")
-$(info Invoking "git submodule update --init")
+$(info Chibios: Invoking "git submodule update --init")
+$(shell git submodule update --init)
+$(info Invoked "git submodule update --init")
+# make is not happy about newly checked out module for some reason but next invocation would work
+$(error Please run 'make' again. Please make sure you have 'git' command in PATH)
+endif
+
+ifeq ("$(wildcard $(CHIBIOS_CONTRIB)/os/hal/hal.mk)","")
+$(info Contrib: Invoking "git submodule update --init")
 $(shell git submodule update --init)
 $(info Invoked "git submodule update --init")
 # make is not happy about newly checked out module for some reason but next invocation would work