diff --git a/examples/rpl-border-router/Makefile b/examples/rpl-border-router/Makefile
index 22d8d743f699a312e2e8b514ddc930b802fdaddd..aaa8ab6cf7a2412aec169e29bf6ba26aeacc358b 100644
--- a/examples/rpl-border-router/Makefile
+++ b/examples/rpl-border-router/Makefile
@@ -1,8 +1,8 @@
 PROJECTDIRS += common
+PREFIX ?= fd00::1/64
+CONTIKI = ../..
 
-CONTIKI=../..
-
--include $(CONTIKI)/Makefile.identify-target 
+-include $(CONTIKI)/Makefile.identify-target
 
 all: border-router.$(TARGET)
 
@@ -17,13 +17,4 @@ include $(SOURCES_DIR)/Makefile
 PROJECTDIRS += $(SOURCES_DIR)
 CFLAGS += -DPROJECT_CONF_PATH=\"$(SOURCES_DIR)/project-conf.h\"
 
-border-router.$(TARGET): $(SOURCES_DIR)/border-router.$(TARGET)
-	cp $< $@
-
-CLEAN += border-router.$(TARGET) $(SOURCES_DIR)/border-router.$(TARGET)
-
-ifeq ($(PREFIX),)
-  PREFIX = fd00::1/64
-endif
-
 include $(CONTIKI)/Makefile.include
diff --git a/examples/rpl-border-router/border-router.c b/examples/rpl-border-router/border-router.c
new file mode 100644
index 0000000000000000000000000000000000000000..30b6d615083cdff4e3ad9d250e5f4d1934920410
--- /dev/null
+++ b/examples/rpl-border-router/border-router.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 201, RISE SICS
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+#include "contiki.h"
+
+PROCESS_NAME(border_router_process);
+
+#if BORDER_ROUTER_CONF_WEBSERVER
+PROCESS_NAME(webserver_nogui_process);
+AUTOSTART_PROCESSES(&border_router_process, &webserver_nogui_process);
+#else /* BORDER_ROUTER_CONF_WEBSERVER */
+AUTOSTART_PROCESSES(&border_router_process);
+#endif /* BORDER_ROUTER_CONF_WEBSERVER */
diff --git a/examples/rpl-border-router/embedded/Makefile b/examples/rpl-border-router/embedded/Makefile
index 5a7b1cd554ee4dc9b66b216ebc0238587095be01..cd806474fa42bf7ef7a9b53b94409eae0d96471c 100644
--- a/examples/rpl-border-router/embedded/Makefile
+++ b/examples/rpl-border-router/embedded/Makefile
@@ -4,7 +4,7 @@
 
 PROJECTDIRS += $(SOURCES_DIR)/$(TARGET)
 
-PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c
+PROJECT_SOURCEFILES += slip-bridge.c httpd-simple.c border-router-embedded.c
 
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
diff --git a/examples/rpl-border-router/embedded/border-router.c b/examples/rpl-border-router/embedded/border-router-embedded.c
similarity index 98%
rename from examples/rpl-border-router/embedded/border-router.c
rename to examples/rpl-border-router/embedded/border-router-embedded.c
index dccb87da26504584d302e35143d26f328b58aab8..cc2f78b5c7ae9e58da2c3c8755cab93b30877c9b 100644
--- a/examples/rpl-border-router/embedded/border-router.c
+++ b/examples/rpl-border-router/embedded/border-router-embedded.c
@@ -104,7 +104,6 @@ PROCESS_THREAD(webserver_nogui_process, ev, data)
 
   PROCESS_END();
 }
-AUTOSTART_PROCESSES(&border_router_process,&webserver_nogui_process);
 
 static const char *TOP = "<html><head><title>ContikiRPL</title></head><body>\n";
 static const char *BOTTOM = "</body></html>\n";
@@ -344,9 +343,6 @@ httpd_simple_get_script(const char *name)
 {
   return generate_routes;
 }
-#else /* BORDER_ROUTER_CONF_WEBSERVER */
-/* No webserver */
-AUTOSTART_PROCESSES(&border_router_process);
 #endif /* BORDER_ROUTER_CONF_WEBSERVER */
 /*---------------------------------------------------------------------------*/
 static void
diff --git a/examples/rpl-border-router/native/Makefile b/examples/rpl-border-router/native/Makefile
index 53b5759e79efbc2071b825f2922ee41a19545eac..f178da2a8556352413ccd188b7a003e00a6af83f 100644
--- a/examples/rpl-border-router/native/Makefile
+++ b/examples/rpl-border-router/native/Makefile
@@ -1,5 +1,6 @@
 MODULES += os/services/slip-cmd
 
+PROJECT_SOURCEFILES += border-router-native.c
 PROJECT_SOURCEFILES += border-router-cmds.c tun-bridge.c httpd-simple.c
 PROJECT_SOURCEFILES += slip-config.c slip-dev.c border-router-mac.c
 
diff --git a/examples/rpl-border-router/native/border-router.c b/examples/rpl-border-router/native/border-router-native.c
similarity index 97%
rename from examples/rpl-border-router/native/border-router.c
rename to examples/rpl-border-router/native/border-router-native.c
index e55e3f87079c7992d85e87867857677d010979e3..8b62fb0f041955a2c765ae27951264755db6dcb6 100644
--- a/examples/rpl-border-router/native/border-router.c
+++ b/examples/rpl-border-router/native/border-router-native.c
@@ -99,8 +99,6 @@ PROCESS_THREAD(webserver_nogui_process, ev, data)
 
   PROCESS_END();
 }
-AUTOSTART_PROCESSES(&border_router_process,&border_router_cmd_process,
-		    &webserver_nogui_process);
 
 static const char *TOP = "<html><head><title>ContikiRPL</title></head><body>\n";
 static const char *BOTTOM = "</body></html>\n";
@@ -204,9 +202,6 @@ httpd_simple_get_script(const char *name)
 {
   return generate_routes;
 }
-#else /* BORDER_ROUTER_CONF_WEBSERVER */
-/* No webserver */
-AUTOSTART_PROCESSES(&border_router_process,&border_router_cmd_process);
 #endif /* BORDER_ROUTER_CONF_WEBSERVER */
 /*---------------------------------------------------------------------------*/
 static void
@@ -299,6 +294,8 @@ PROCESS_THREAD(border_router_process, ev, data)
 
   PROCESS_PAUSE();
 
+  process_start(&border_router_cmd_process, NULL);
+
   PRINTF("RPL-Border router started\n");
 
   slip_config_handle_arguments(contiki_argc, contiki_argv);