diff --git a/examples/ipv6/native-border-router/Makefile b/examples/ipv6/native-border-router/Makefile
index c5bf4cb01..94068a10b 100644
--- a/examples/ipv6/native-border-router/Makefile
+++ b/examples/ipv6/native-border-router/Makefile
@@ -1,6 +1,6 @@
 CONTIKI_PROJECT=border-router
 all: $(CONTIKI_PROJECT)
-APPS = slip-cmd
+MODULES += os/services/slip-cmd
 
 CONTIKI=../../..
 
diff --git a/examples/ipv6/slip-radio/Makefile b/examples/ipv6/slip-radio/Makefile
index 7db69c74a..293c143f3 100644
--- a/examples/ipv6/slip-radio/Makefile
+++ b/examples/ipv6/slip-radio/Makefile
@@ -1,6 +1,6 @@
 CONTIKI_PROJECT=slip-radio
 all: $(CONTIKI_PROJECT)
-APPS = slip-cmd
+MODULES += os/services/slip-cmd
 
 ifeq ($(TARGET),)
   -include Makefile.target
diff --git a/apps/slip-cmd/cmd.c b/os/services/slip-cmd/cmd.c
similarity index 100%
rename from apps/slip-cmd/cmd.c
rename to os/services/slip-cmd/cmd.c
diff --git a/apps/slip-cmd/cmd.h b/os/services/slip-cmd/cmd.h
similarity index 100%
rename from apps/slip-cmd/cmd.h
rename to os/services/slip-cmd/cmd.h
diff --git a/apps/slip-cmd/packetutils.c b/os/services/slip-cmd/packetutils.c
similarity index 100%
rename from apps/slip-cmd/packetutils.c
rename to os/services/slip-cmd/packetutils.c
diff --git a/apps/slip-cmd/packetutils.h b/os/services/slip-cmd/packetutils.h
similarity index 100%
rename from apps/slip-cmd/packetutils.h
rename to os/services/slip-cmd/packetutils.h