Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 5da468ef646d75eceb4aa88033bece23060612fb)
+++ uspace/Makefile	(revision 0a72efcb56c11bc14200cc2b33ba2af13610c8c7)
@@ -65,5 +65,6 @@
 	srv/hid/fb \
 	srv/hid/kbd \
-	srv/hw/char/i8042
+	srv/hw/char/i8042 \
+	srv/hw/netif/dp8390
 
 ## Platform-specific hardware support
@@ -95,8 +96,4 @@
 #
 
-ifeq ($(CONFIG_NETIF_DP8390),y)
-	DIRS += srv/net/netif/dp8390
-endif
-
 NETWORKING_COMMON = \
 	srv/net/netif/lo \
@@ -104,10 +101,9 @@
 	srv/net/nil/nildummy \
 	srv/net/net \
-	srv/net/net/start \
-	srv/net/socket \
-	srv/net/app/echo \
-	srv/net/app/ping \
-	srv/net/app/nettest1 \
-	srv/net/app/nettest2
+	srv/net/netstart \
+	app/netecho \
+	app/nettest1 \
+	app/nettest2 \
+	app/ping
 
 NETWORKING_MODULAR = \
@@ -128,4 +124,7 @@
 	lib/softint \
 	lib/softfloat \
+	lib/socket \
+	lib/net \
+	lib/netif
 
 ifeq ($(UARCH),amd64)
@@ -149,8 +148,4 @@
 endif
 
-ifeq ($(CONFIG_NETWORKING),none)
-	BUILDS := $(addsuffix .build,$(DIRS))
-endif
-
 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))