diff --git a/software/Makefile b/software/Makefile
index 57c3e46cf129500217fa149d7e2954daf0c2e40f..fd02cc75837e6af54647b829f23cf3b141615125 100644
--- a/software/Makefile
+++ b/software/Makefile
@@ -7,9 +7,10 @@ REPO_PARENT ?= $(shell /bin/pwd)/..
 
 DIRS = kernel
 
-.PHONY: all clean modules install modules_install $(DIRS)
+.PHONY: all clean modules install modules_install coccicheck $(DIRS)
 
-all clean modules install coccicheck modules_install: $(DIRS)
+all clean : $(DIRS)
+install modules_install coccicheck modules: kernel
 
 clean: TARGET = clean
 modules: TARGET = modules
@@ -17,8 +18,5 @@ coccicheck: TARGET = coccicheck
 install: TARGET = install
 modules_install: TARGET = modules_install
 
-ENV_VAR := CONFIG_FPGA_MGR_BACKPORT_PATH=$(CONFIG_FPGA_MGR_BACKPORT_PATH)
-ENV_VAR += CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT)
-
 $(DIRS):
 	$(MAKE) -C $@ $(ENV_VAR) $(TARGET)
diff --git a/software/kernel/Makefile b/software/kernel/Makefile
index c21e88fd3b899cc5c6e10b837f487f124ff41433..0a10bdccd17468b39d1c0ee1226d8229f97c99d8 100644
--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -43,7 +43,7 @@ CHEBY ?= /usr/bin/cheby
 
 all: modules
 
-.PHONY: all modules clean help install modules_install spec-core-fpga.h
+.PHONY: all modules clean help install modules_install coccicheck spec-core-fpga.h
 
 spec-core-fpga.h:
 ifeq ($(DKMS), 0)
@@ -58,4 +58,11 @@ endif
 install: modules_install
 clean: clean-spec-core-fpga.h
 modules help coccicheck modules_install clean: spec-core-fpga.h
-	$(MAKE) -C $(LINUX) M=$(shell pwd) VERSION=$(VERSION) CONFIG_FPGA_MGR_BACKPORT_PATH_ABS=$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS) CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) FMC_ABS=$(FMC_ABS) I2C_ABS=$(I2C_ABS) SPI_ABS=$(SPI_ABS) $@
+	$(MAKE) -C $(LINUX) M=$(shell pwd) \
+		VERSION=$(VERSION) \
+		CONFIG_FPGA_MGR_BACKPORT_PATH_ABS=$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS) \
+		CONFIG_FPGA_MGR_BACKPORT=$(CONFIG_FPGA_MGR_BACKPORT) \
+		FMC_ABS=$(FMC_ABS) \
+		I2C_ABS=$(I2C_ABS) \
+		SPI_ABS=$(SPI_ABS) \
+		$@