diff --git a/core/net/rime/Makefile.rime b/core/net/rime/Makefile.rime
index 364bf13af..e45e0c391 100644
--- a/core/net/rime/Makefile.rime
+++ b/core/net/rime/Makefile.rime
@@ -1,3 +1,7 @@
+ifdef UIP_CONF_IPV6
+#RIME_UIP6      = rime-udp.c
+RIME_BASE      = rimeaddr.c timesynch.c rimestats.c
+else
 RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
 RIME_BASE      = rimeaddr.c rime.c timesynch.c \
                  rimestats.c announcement.c polite-announcement.c \
@@ -10,8 +14,6 @@ RIME_MESH      = mesh.c route.c route-discovery.c
 RIME_COLLECT   = collect.c collect-neighbor.c neighbor-discovery.c \
 		 collect-link-estimate.c
 RIME_RUDOLPH   = rudolph0.c rudolph1.c rudolph2.c
-ifdef UIP_CONF_IPV6
-#RIME_UIP6      = rime-udp.c
 endif # UIP_CONF_IPV6
 
 CONTIKI_SOURCEFILES += $(RIME_BASE) \