diff --git a/Makefile.include b/Makefile.include
index f8c9c8eed..b878ffd94 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -58,7 +58,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
 TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
 
-include $(CONTIKI)/core/net/rime/Makefile.rime
+#include $(CONTIKI)/core/net/rime/Makefile.rime
 include $(CONTIKI)/core/net/mac/Makefile.mac
 SYSTEM  = process.c procinit.c autostart.c elfloader.c \
           compower.c serial-line.c
diff --git a/core/net/rime/Makefile.rime b/core/net/rime/Makefile.core-net-rime
similarity index 83%
rename from core/net/rime/Makefile.rime
rename to core/net/rime/Makefile.core-net-rime
index c99faa3d5..a18a3e84b 100644
--- a/core/net/rime/Makefile.rime
+++ b/core/net/rime/Makefile.core-net-rime
@@ -1,7 +1,3 @@
-ifeq ($(UIP_CONF_IPV6),1)
-#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 \
@@ -14,9 +10,8 @@ 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
-endif # UIP_CONF_IPV6
 
-CONTIKI_SOURCEFILES += $(RIME_BASE) \
+core-net-rime_src = $(RIME_BASE) \
                $(RIME_SINGLEHOP) \
                $(RIME_MULTIHOP) \
                $(RIME_MESH) \