Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ boot/Makefile.common	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -100,4 +100,6 @@
 	$(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
 	$(USPACE_PATH)/srv/net/netif/lo/lo \
+	$(USPACE_PATH)/srv/net/nil/eth/eth \
+	$(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
 	$(USPACE_PATH)/srv/net/il/arp/arp \
 	$(USPACE_PATH)/srv/net/il/ip/ip \
@@ -115,10 +117,4 @@
 
 RD_DRV_CFG = 
-
-ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	RD_SRVS_NON_ESSENTIAL += \
-		$(USPACE_PATH)/srv/net/nil/eth/eth \
-		$(USPACE_PATH)/srv/net/nil/nildummy/nildummy
-endif
 
 RD_APPS_ESSENTIAL = \
Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/amd64/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -65,4 +65,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/arm32/Makefile.config
===================================================================
--- defaults/arm32/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/arm32/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -41,4 +41,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/ia32/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -71,4 +71,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ia64/Makefile.config
===================================================================
--- defaults/ia64/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/ia64/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -53,4 +53,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/mips32/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -47,4 +47,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ppc32/Makefile.config
===================================================================
--- defaults/ppc32/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/ppc32/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -47,4 +47,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/sparc64/Makefile.config
===================================================================
--- defaults/sparc64/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/sparc64/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -62,4 +62,2 @@
 CONFIG_MOUNT_DATA = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/special/Makefile.config
===================================================================
--- defaults/special/Makefile.config	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ defaults/special/Makefile.config	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -32,4 +32,2 @@
 CONFIG_START_BD = n
 
-# Bundle netif/nil network layer
-CONFIG_NETIF_NIL_BUNDLE = n
Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -93,13 +93,7 @@
 #
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LIBN = \
-		srv/net/nil/eth \
-		srv/net/nil/nildummy
-else
-	DIRS += \
-		srv/net/nil/eth \
-		srv/net/nil/nildummy
-endif
+DIRS += \
+	srv/net/nil/eth \
+	srv/net/nil/nildummy
 
 ## Platform-specific hardware support
Index: uspace/srv/hw/netif/dp8390/Makefile
===================================================================
--- uspace/srv/hw/netif/dp8390/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/srv/hw/netif/dp8390/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -39,8 +39,4 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LIBS += $(USPACE_PREFIX)/srv/net/nil/eth/libeth.a
-endif
-
 BINARY = dp8390
 
Index: uspace/srv/net/cfg/Makefile
===================================================================
--- uspace/srv/net/cfg/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/srv/net/cfg/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -36,11 +36,6 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LO_SOURCE = lo.netif_nil_bundle
-	NE2K_SOURCE = ne2k.netif_nil_bundle
-else
-	LO_SOURCE = lo.netif_standalone
-	NE2K_SOURCE = ne2k.netif_standalone
-endif
+LO_SOURCE = lo.netif_standalone
+NE2K_SOURCE = ne2k.netif_standalone
 
 LO_TARGET = lo
Index: pace/srv/net/cfg/lo.netif_nil_bundle
===================================================================
--- uspace/srv/net/cfg/lo.netif_nil_bundle	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ 	(revision )
@@ -1,13 +1,0 @@
-# loopback configuration
-
-NAME=lo
-
-NETIF=lo
-NIL=lo
-IL=ip
-
-IP_CONFIG=static
-IP_ADDR=127.0.0.1
-IP_NETMASK=255.0.0.0
-
-MTU=15535
Index: pace/srv/net/cfg/ne2k.netif_nil_bundle
===================================================================
--- uspace/srv/net/cfg/ne2k.netif_nil_bundle	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ 	(revision )
@@ -1,24 +1,0 @@
-# DP8390 (NE2k) configuration
-
-NAME=ne2k
-
-NETIF=dp8390
-NIL=dp8390
-IL=ip
-
-IRQ=9
-IO=300
-
-# 8023_2_LSAP, 8023_2_SNAP
-ETH_MODE=DIX
-ETH_DUMMY=no
-
-IP_CONFIG=static
-IP_ADDR=10.0.2.15
-IP_ROUTING=yes
-IP_NETMASK=255.255.255.240
-IP_BROADCAST=10.0.2.255
-IP_GATEWAY=10.0.2.2
-ARP=arp
-
-MTU=1492
Index: uspace/srv/net/netif/lo/Makefile
===================================================================
--- uspace/srv/net/netif/lo/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/srv/net/netif/lo/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -39,8 +39,4 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LIBS += $(USPACE_PREFIX)/srv/net/nil/nildummy/libnildummy.a
-endif
-
 BINARY = lo
 
Index: uspace/srv/net/nil/eth/Makefile
===================================================================
--- uspace/srv/net/nil/eth/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/srv/net/nil/eth/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -39,9 +39,5 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LIBRARY = libeth
-else
-	BINARY = eth
-endif
+BINARY = eth
 
 SOURCES = \
Index: uspace/srv/net/nil/nildummy/Makefile
===================================================================
--- uspace/srv/net/nil/nildummy/Makefile	(revision cc274f5ae848eb33a39532bef0286c53aba617d5)
+++ uspace/srv/net/nil/nildummy/Makefile	(revision 59e9398b3988971c8517c1583fced494647f87ba)
@@ -39,9 +39,5 @@
 -include $(CONFIG_MAKEFILE)
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-	LIBRARY = libnildummy
-else
-	BINARY = nildummy
-endif
+BINARY = nildummy
 
 SOURCES = \