diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile
index 2fa19c677d..1b5dfa2090 100644
--- a/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile
+++ b/src/add-ons/kernel/drivers/network/marvell_yukon/Jamfile
@@ -1,3 +1,27 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon ;
 
-SubInclude HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+	: true ;
+UsePrivateHeaders net system ;
+UsePrivateKernelHeaders ;
+
+SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
+
+UseHeaders [ FDirName $(SUBDIR) ] : true ;
+
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev mii ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev msk ] ;
+
+KernelAddon marvell_yukon :
+	glue.c
+	ukphy.c
+	ukphy_subr.c
+	e1000phy.c
+	if_msk.c
+	: libfreebsd_network.a
+	;
+
+ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) e1000phy$(SUFOBJ) ]
+	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
+		compat freebsd_network ] ;
+Includes [ FGristFiles ukphy.c e1000phy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/Jamfile
deleted file mode 100644
index 4d8b72ee96..0000000000
--- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev mii ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev msk ;
diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile
deleted file mode 100644
index 5f9d3f5d42..0000000000
--- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/mii/Jamfile
+++ /dev/null
@@ -1,21 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev mii ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
-
-KernelStaticLibrary marvell_yukon_mii.a
-	:
-	e1000phy.c
-	ukphy.c
-	ukphy_subr.c
-	;
-
-ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ]
-	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd_network ] ;
-Includes [ FGristFiles e1000phy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile b/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile
deleted file mode 100644
index 510fb28357..0000000000
--- a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/Jamfile
+++ /dev/null
@@ -1,15 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network marvell_yukon dev msk ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
-
-KernelAddon marvell_yukon :
-	if_msk.c
-	glue.c
-	: marvell_yukon_mii.a libfreebsd_network.a
-	;
diff --git a/src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c b/src/add-ons/kernel/drivers/network/marvell_yukon/glue.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/marvell_yukon/dev/msk/glue.c
rename to src/add-ons/kernel/drivers/network/marvell_yukon/glue.c