diff --git a/src/add-ons/kernel/drivers/network/stack/Jamfile b/src/add-ons/kernel/drivers/network/stack/Jamfile
index 74db2a8dc6..e3d691aaf6 100644
--- a/src/add-ons/kernel/drivers/network/stack/Jamfile
+++ b/src/add-ons/kernel/drivers/network/stack/Jamfile
@@ -4,13 +4,13 @@ UsePrivateHeaders net ;
 
 # a) Userland stack version:
 
-# R5KernelAddon net_stack_driver : kernel drivers bin :
-#	net_userstack_driver.c
-# ;
+R5KernelAddon net_server_driver : kernel drivers bin :
+	net_server_driver.c
+;
 
 # For OpenBeOS we should be building the driver objects this way.
 #KernelObjects
-#	net_userstack_driver.c
+#	net_server_driver.c
 #	:
 #	-fno-pic -D_KERNEL_MODE
 #	;
@@ -28,11 +28,15 @@ R5KernelAddon net_stack_driver : kernel drivers bin :
 #	-fno-pic -D_KERNEL_MODE
 #	;
 
-
-# Link to kernel/drivers/dev/net
+# Link driver(s) to kernel/drivers/dev/net
 {
 	local dir = [ FDirName $(OBOS_ADDON_DIR) kernel drivers dev net ] ;
+
 	local instDriver = <kernel!drivers!dev!net>net_stack_driver ;
 	MakeLocate $(instDriver) : $(dir) ;
 	RelSymLink $(instDriver) : net_stack_driver ;
+
+	local instDriver = <kernel!drivers!dev!net>net_server_driver ;
+	MakeLocate $(instDriver) : $(dir) ;
+	RelSymLink $(instDriver) : net_server_driver ;
 }
diff --git a/src/add-ons/kernel/drivers/network/stack/net_userstack_driver.c b/src/add-ons/kernel/drivers/network/stack/net_server_driver.c
similarity index 99%
rename from src/add-ons/kernel/drivers/network/stack/net_userstack_driver.c
rename to src/add-ons/kernel/drivers/network/stack/net_server_driver.c
index 474d5a86e5..321e663959 100644
--- a/src/add-ons/kernel/drivers/network/stack/net_userstack_driver.c
+++ b/src/add-ons/kernel/drivers/network/stack/net_server_driver.c
@@ -697,6 +697,8 @@ set_command_areas(net_command *command)
 			break;
 		}
 
+/*
+	TODO/FIXME: phoudoin: where are these opcodes defined!?!
 		case OSIOCGIFCONF:
 		case SIOCGIFCONF:
 		{
@@ -705,6 +707,7 @@ set_command_areas(net_command *command)
 			get_area_from_address(&command->area[1],ifc->ifc_buf);
 			break;
 		}
+*/
 	}	
 }