diff --git a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile b/src/add-ons/kernel/drivers/network/atheros813x/Jamfile
index d9fc8ad76c..e22a0e9d50 100644
--- a/src/add-ons/kernel/drivers/network/atheros813x/Jamfile
+++ b/src/add-ons/kernel/drivers/network/atheros813x/Jamfile
@@ -1,3 +1,26 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x ;
 
-SubInclude HAIKU_TOP src add-ons kernel drivers network atheros813x 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 alc ] ;
+
+KernelAddon atheros813x :
+	glue.c
+	ukphy.c
+	ukphy_subr.c
+	if_alc.c
+	: libfreebsd_network.a
+	;
+
+ObjectHdrs [ FGristFiles ukphy$(SUFOBJ) ]
+	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
+		compat freebsd_network ] ;
+Includes [ FGristFiles ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/Jamfile b/src/add-ons/kernel/drivers/network/atheros813x/dev/Jamfile
deleted file mode 100644
index df49dab682..0000000000
--- a/src/add-ons/kernel/drivers/network/atheros813x/dev/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network atheros813x dev mii ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network atheros813x dev alc ;
diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/Jamfile b/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/Jamfile
deleted file mode 100644
index cf82e9c312..0000000000
--- a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/Jamfile
+++ /dev/null
@@ -1,18 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x dev alc ;
-
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
-	: true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 ] ;
-
-KernelAddon atheros813x :
-	if_alc.c
-	glue.c
-	: atheros813x_mii.a libfreebsd_network.a
-	;
-
diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/atheros813x/dev/mii/Jamfile
deleted file mode 100644
index 48d75f0b3c..0000000000
--- a/src/add-ons/kernel/drivers/network/atheros813x/dev/mii/Jamfile
+++ /dev/null
@@ -1,17 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network atheros813x dev mii ;
-
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
-	: true ;
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
-
-KernelStaticLibrary atheros813x_mii.a
-	:
-	ukphy.c
-	ukphy_subr.c
-	;
-
diff --git a/src/add-ons/kernel/drivers/network/atheros813x/dev/alc/glue.c b/src/add-ons/kernel/drivers/network/atheros813x/glue.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/atheros813x/dev/alc/glue.c
rename to src/add-ons/kernel/drivers/network/atheros813x/glue.c