diff --git a/core/net/Makefile.core-net b/core/net/Makefile.core-net
new file mode 100644
index 000000000..fa9268384
--- /dev/null
+++ b/core/net/Makefile.core-net
@@ -0,0 +1 @@
+core-net_src = netstack.c  packetbuf.c  packetqueue.c	queuebuf.c nbr-table.c
diff --git a/core/net/Makefile.uip b/core/net/Makefile.uip
deleted file mode 100644
index 29b5de528..000000000
--- a/core/net/Makefile.uip
+++ /dev/null
@@ -1,31 +0,0 @@
-NET =						\
-dhcpc.c						\
-nbr-table.c			\
-netstack.c					\
-packetbuf.c					\
-packetqueue.c					\
-psock.c						\
-queuebuf.c					\
-resolv.c					\
-sicslowpan.c					\
-simple-udp.c					\
-tcpip.c						\
-uaodv-rt.c					\
-uaodv.c						\
-uip-debug.c					\
-uip-ds6-route.c					\
-uip-ds6-nbr.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
diff --git a/core/net/ip/Makefile.core-net-ip b/core/net/ip/Makefile.core-net-ip
new file mode 100644
index 000000000..5331d4acd
--- /dev/null
+++ b/core/net/ip/Makefile.core-net-ip
@@ -0,0 +1,4 @@
+core-net-ip_src = \
+dhcpc.c   simple-udp.c	uip-debug.c	   uip-split.c      \
+psock.c   slipdev.c	uiplib.c	   uip-udp-packet.c \
+resolv.c  tcpip.c	uip-packetqueue.c
diff --git a/core/net/ipv4/Makefile.core-net-ipv4 b/core/net/ipv4/Makefile.core-net-ipv4
new file mode 100644
index 000000000..416f82eb7
--- /dev/null
+++ b/core/net/ipv4/Makefile.core-net-ipv4
@@ -0,0 +1,3 @@
+core-net-ipv4_src = \
+uaodv-rt.c  uip.c     uip-fw-drv.c    uip-over-mesh.c \
+uaodv.c  uip_arp.c   uip-fw.c  uip-neighbor.c
diff --git a/core/net/ipv6/Makefile.core-net-ipv6 b/core/net/ipv6/Makefile.core-net-ipv6
new file mode 100644
index 000000000..ce8269cff
--- /dev/null
+++ b/core/net/ipv6/Makefile.core-net-ipv6
@@ -0,0 +1,3 @@
+core-net-ipv6_src = \
+sicslowpan.c  uip-ds6.c      uip-ds6-route.c  uip-nd6.c \
+uip6.c	      uip-ds6-nbr.c  uip-icmp6.c