diff --git a/package/ep80579-drivers/Makefile b/package/ep80579-drivers/Makefile
index f20c75219..a1401dd49 100644
--- a/package/ep80579-drivers/Makefile
+++ b/package/ep80579-drivers/Makefile
@@ -29,8 +29,8 @@ $(call KernelPackage/ep80579-drivers/Default)
   SUBMENU:=Network Devices
   TITLE:=Intel EP80579 ethernet driver
   FILES:= \
-	$(PKG_BUILD_DIR)/Embedded/build/gcu.ko \
-	$(PKG_BUILD_DIR)/Embedded/build/iegbe.ko
+	$(PKG_BUILD_DIR)/Embedded/src/GbE/gcu.ko \
+	$(PKG_BUILD_DIR)/Embedded/src/GbE/iegbe.ko
   AUTOLOAD:=$(call AutoLoad,40,gcu iegbe)
 endef
 
@@ -39,8 +39,8 @@ $(call KernelPackage/ep80579-drivers/Default)
   SUBMENU:=Other modules
   TITLE:=Misc. Intel EP80579 drivers (DMA,, gpio)
   FILES:= \
-	$(PKG_BUILD_DIR)/Embedded/build/dma.ko \
-	$(PKG_BUILD_DIR)/Embedded/build/gpio.ko
+	$(PKG_BUILD_DIR)/Embedded/src/EDMA/dma.ko \
+	$(PKG_BUILD_DIR)/Embedded/src/GPIO/gpio.ko
   AUTOLOAD:=$(call AutoLoad,40,gpio dma)
 endef
 
@@ -49,8 +49,8 @@ $(call KernelPackage/ep80579-drivers/Default)
   SUBMENU:=Other modules
   TITLE:=Intel EP80579 CAN driver
   FILES:= \
-	$(PKG_BUILD_DIR)/Embedded/build/timesync.ko \
-	$(PKG_BUILD_DIR)/Embedded/build/can.ko
+	$(PKG_BUILD_DIR)/Embedded/src/1588/timesync.ko \
+	$(PKG_BUILD_DIR)/Embedded/src/CAN/can.ko
   AUTOLOAD:=$(call AutoLoad,40,timesync can)
 endef
 
@@ -61,14 +61,26 @@ define Build/Prepare
 	$(Build/Patch)
 endef
 
-define Build/Compile
-	(cd $(PKG_BUILD_DIR)/Embedded; \
-		$(MAKE) KERNEL_SOURCE_ROOT=$(LINUX_DIR) \
-		KSRC=$(LINUX_DIR) \
-		KOBJ=$(LINUX_DIR) \
+define Build/Compile/Subdir
+	$(MAKE) -C "$(LINUX_DIR)" \
+		KSRC="$(LINUX_DIR)" \
+		KOBJ="$(LINUX_DIR)" \
 		ENV_DIR=$(PKG_BUILD_DIR)/Embedded \
-		all \
-	)
+		SUBDIRS="$(PKG_BUILD_DIR)/Embedded/src/$(1)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCHIVER="$(TARGET_CROSS)ar" \
+		COMPILER="$(TARGET_CC)" \
+		LINKER="$(TARGET_CROSS)ld" \
+		ARCH="$(LINUX_KARCH)"
+endef
+
+define Build/Compile
+	$(call Build/Compile/Subdir,GbE)
+	$(call Build/Compile/Subdir,CAN)
+	$(call Build/Compile/Subdir,EDMA)
+	$(call Build/Compile/Subdir,GPIO)
+	$(call Build/Compile/Subdir,WDT)
+	$(call Build/Compile/Subdir,1588)
 endef
 
 define KernelPackage/ep80579-eth/install