diff --git a/Makefile.include b/Makefile.include
index 74a711797..d3e7b5abd 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -49,10 +49,16 @@ SYSTEM  = process.c procinit.c autostart.c elfloader.c profile.c timetable.c tim
 THREADS = mt.c
 LIBS    = memb.c timer.c list.c etimer.c energest.c rtimer.c stimer.c \
           print-stats.c ifft.c crc16.c
+ifdef UIP_CONF_IPV6
+UIP     = uip6.c tcpip.c uip-split.c  psock.c uip-udp-packet.c \
+          uip-over-mesh.c resolv.c hc.c tcpdump.c uiplib.c
+NET     = $(UIP) uip-icmp6.c uip-nd6.c uip-nd6-io.c uip-netif.c sicslowpan.c
+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 #rawpacket-udp.c
 NET     = $(UIP) uaodv.c uaodv-rt.c
+endif # UIP_CONF_IPV6
 CTK     = ctk.c
 CTKVNC  = $(CTK) ctk-vncserver.c libconio.c vnc-server.c vnc-out.c ctk-vncfont.c