diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile
index 1483d23ef8..336e5f8577 100644
--- a/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile
+++ b/src/add-ons/kernel/drivers/network/attansic_l2/Jamfile
@@ -1,3 +1,26 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 ;
 
-SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l2 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 ae ] ;
+
+KernelAddon attansic_l2 :
+	glue.c
+	ukphy.c
+	ukphy_subr.c
+	if_ae.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/attansic_l2/dev/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/dev/Jamfile
deleted file mode 100644
index e14c0b94db..0000000000
--- a/src/add-ons/kernel/drivers/network/attansic_l2/dev/Jamfile
+++ /dev/null
@@ -1,5 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev mii ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network  attansic_l2 dev ae ;
-
diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile
deleted file mode 100644
index 5a7ce2efd4..0000000000
--- a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/Jamfile
+++ /dev/null
@@ -1,15 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 dev ae ;
-
-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 attansic_l2 :
-	if_ae.c
-	glue.c
-	: attansic_l2_mii.a libfreebsd_network.a
-	;
diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile
deleted file mode 100644
index 6e97f55755..0000000000
--- a/src/add-ons/kernel/drivers/network/attansic_l2/dev/mii/Jamfile
+++ /dev/null
@@ -1,16 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network attansic_l2 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 attansic_l2_mii.a
-	:
-	ukphy.c
-	ukphy_subr.c
-	;
-
diff --git a/src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/glue.c b/src/add-ons/kernel/drivers/network/attansic_l2/glue.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/attansic_l2/dev/ae/glue.c
rename to src/add-ons/kernel/drivers/network/attansic_l2/glue.c