diff --git a/Makefile.include b/Makefile.include
index 86f080ee3..f24507a1a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -62,24 +62,9 @@ THREADS = mt.c
 LIBS    = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c \
           print-stats.c ifft.c crc16.c random.c checkpoint.c ringbuf.c
 DEV     = nullradio.c
-NET     = netstack.c uip-debug.c packetbuf.c queuebuf.c packetqueue.c
 
-ifeq ($(UIP_CONF_IPV6),1)
-  CFLAGS += -DUIP_CONF_IPV6=1
-  UIP   = uip6.c tcpip.c psock.c uip-udp-packet.c uip-split.c \
-          resolv.c tcpdump.c uiplib.c simple-udp.c
-  NET   += $(UIP) uip-icmp6.c uip-nd6.c uip-packetqueue.c \
-          sicslowpan.c neighbor-attr.c neighbor-info.c uip-ds6.c uip-ds6-route.c
-  ifneq ($(UIP_CONF_RPL),0)
-    CFLAGS += -DUIP_CONF_IPV6_RPL=1
-    include $(CONTIKI)/core/net/rpl/Makefile.rpl
-  endif # UIP_CONF_RPL
-else # UIP_CONF_IPV6
-  UIP   = uip.c uiplib.c resolv.c tcpip.c psock.c hc.c uip-split.c uip-fw.c \
-          uip-fw-drv.c uip_arp.c tcpdump.c uip-neighbor.c uip-udp-packet.c \
-          uip-over-mesh.c dhcpc.c simple-udp.c
-  NET   += $(UIP) uaodv.c uaodv-rt.c
-endif # UIP_CONF_IPV6
+include $(CONTIKI)/core/net/Makefile.uip
+include $(CONTIKI)/core/net/rpl/Makefile.rpl
 
 CTK     = ctk.c
 CTKVNC  = $(CTK) ctk-vncserver.c libconio.c vnc-server.c vnc-out.c ctk-vncfont.c
diff --git a/core/net/Makefile.uip b/core/net/Makefile.uip
new file mode 100644
index 000000000..469a29b22
--- /dev/null
+++ b/core/net/Makefile.uip
@@ -0,0 +1,33 @@
+NET =						\
+dhcpc.c						\
+hc.c						\
+neighbor-attr.c					\
+neighbor-info.c					\
+netstack.c					\
+packetbuf.c					\
+packetqueue.c					\
+psock.c						\
+queuebuf.c					\
+resolv.c					\
+sicslowpan.c					\
+simple-udp.c					\
+tcpdump.c					\
+tcpip.c						\
+uaodv-rt.c					\
+uaodv.c						\
+uip-debug.c					\
+uip-ds6-route.c					\
+uip-ds6.c					\
+uip-fw-drv.c					\
+uip-fw.c					\
+uip-icmp6.c					\
+uip-nd6.c					\
+uip-neighbor.c					\
+uip-over-mesh.c					\
+uip-packetqueue.c				\
+uip-split.c					\
+uip-udp-packet.c				\
+uip.c						\
+uip6.c						\
+uip_arp.c					\
+uiplib.c