diff --git a/os/net/mac/tsch/tsch-rpl.c b/os/net/mac/tsch/tsch-rpl.c
index 78d102fad..99cb8d9a2 100644
--- a/os/net/mac/tsch/tsch-rpl.c
+++ b/os/net/mac/tsch/tsch-rpl.c
@@ -75,14 +75,7 @@ tsch_rpl_callback_joining_network(void)
 void
 tsch_rpl_callback_leaving_network(void)
 {
-  rpl_dag_t *dag = rpl_get_any_dag();
-  if(dag != NULL) {
-#if UIP_CONF_IPV6_RPL_LITE
-    rpl_local_repair("TSCH leaving");
-#else
-    rpl_local_repair(dag->instance);
-#endif
-  }
+  NETSTACK_ROUTING.local_repair("TSCH leaving");
 }
 /*---------------------------------------------------------------------------*/
 /* Set TSCH EB period based on current RPL DIO period.
diff --git a/os/net/routing/nullrouting/nullrouting.c b/os/net/routing/nullrouting/nullrouting.c
index 152b43bc5..01e7a7d46 100644
--- a/os/net/routing/nullrouting/nullrouting.c
+++ b/os/net/routing/nullrouting/nullrouting.c
@@ -58,11 +58,23 @@ root_start(void)
   return 0;
 }
 /*---------------------------------------------------------------------------*/
+static void
+global_repair(const char *str)
+{
+}
+/*---------------------------------------------------------------------------*/
+static void
+local_repair(const char *str)
+{
+}
+/*---------------------------------------------------------------------------*/
 const struct routing_driver nullrouting_driver = {
   "Null Routing",
   init,
   root_set_prefix,
   root_start,
+  global_repair,
+  local_repair
 };
 /*---------------------------------------------------------------------------*/
 
diff --git a/os/net/routing/routing.h b/os/net/routing/routing.h
index a213cc92d..5a61c98cc 100644
--- a/os/net/routing/routing.h
+++ b/os/net/routing/routing.h
@@ -65,6 +65,19 @@ struct routing_driver {
    * \return 0 in case of success, -1 otherwise
   */
   int (* root_start)(void);
+  /**
+   * Triggers a global topology repair
+   *
+   * \param str A textual description of the cause for triggering a repair
+  */
+  void (* global_repair)(const char *str);
+
+  /**
+   * Triggers a RPL local topology repair
+   *
+   * \param str A textual description of the cause for triggering a repair
+  */
+  void (* local_repair)(const char *str);
 };
 
 #endif /* ROUTING_H_ */
diff --git a/os/net/routing/rpl-classic/rpl.c b/os/net/routing/rpl-classic/rpl.c
index 4677b316a..517f98cdf 100644
--- a/os/net/routing/rpl-classic/rpl.c
+++ b/os/net/routing/rpl-classic/rpl.c
@@ -353,11 +353,31 @@ init(void)
 #endif /* RPL_WITH_NON_STORING */
 }
 /*---------------------------------------------------------------------------*/
+static void
+global_repair(const char *str)
+{
+  rpl_dag_t *dag = rpl_get_any_dag();
+  if(dag != NULL && dag->instance != NULL) {
+    rpl_repair_root(dag->instance->instance_id);
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+local_repair(const char *str)
+{
+  rpl_dag_t *dag = rpl_get_any_dag();
+  if(dag != NULL) {
+    rpl_local_repair(dag->instance);
+  }
+}
+/*---------------------------------------------------------------------------*/
 const struct routing_driver rpl_classic_driver = {
   "RPL Classic",
   init,
   rpl_dag_root_set_prefix,
   rpl_dag_root_start,
+  global_repair,
+  local_repair,
 };
 /*---------------------------------------------------------------------------*/
 
diff --git a/os/net/routing/rpl-lite/rpl-dag.c b/os/net/routing/rpl-lite/rpl-dag.c
index a89b972c1..2f89cc1ff 100644
--- a/os/net/routing/rpl-lite/rpl-dag.c
+++ b/os/net/routing/rpl-lite/rpl-dag.c
@@ -169,11 +169,11 @@ find_objective_function(rpl_ocp_t ocp)
 }
 /*---------------------------------------------------------------------------*/
 void
-rpl_global_repair(void)
+rpl_global_repair(const char *str)
 {
   if(rpl_dag_root_is_root()) {
-    LOG_WARN("initiating global repair, version %u, rank %u)\n",
-         curr_instance.dag.version, curr_instance.dag.rank);
+    LOG_WARN("initiating global repair (%s), version %u, rank %u)\n",
+         str, curr_instance.dag.version, curr_instance.dag.rank);
 #if LOG_INFO_ENABLED
     rpl_neighbor_print_list("Global repair (before)");
 #endif /* LOG_INFO_ENABLED */
@@ -391,7 +391,7 @@ process_dio_from_current_dag(uip_ipaddr_t *from, rpl_dio_t *dio)
       LOG_ERR("inconsistent DIO version (current: %u, received: %u), initiate global repair\n",
           curr_instance.dag.version, dio->version);
       curr_instance.dag.version = dio->version; /* Update version and trigger global repair */
-      rpl_global_repair();
+      rpl_global_repair("Inconsistent DIO version");
     } else {
       LOG_WARN("new DIO version (current: %u, received: %u), apply global repair\n",
           curr_instance.dag.version, dio->version);
diff --git a/os/net/routing/rpl-lite/rpl-dag.h b/os/net/routing/rpl-lite/rpl-dag.h
index bc59ac4bb..52e14c9f3 100644
--- a/os/net/routing/rpl-lite/rpl-dag.h
+++ b/os/net/routing/rpl-lite/rpl-dag.h
@@ -78,8 +78,10 @@ void rpl_dag_periodic(unsigned seconds);
 
 /**
  * Triggers a RPL global repair
+ *
+ * \param str A textual description of the cause for triggering a repair
 */
-void rpl_global_repair(void);
+void rpl_global_repair(const char *str);
 
 /**
  * Triggers a RPL local repair
diff --git a/os/net/routing/rpl-lite/rpl.c b/os/net/routing/rpl-lite/rpl.c
index 53ca4d6c0..7a79a3a3f 100644
--- a/os/net/routing/rpl-lite/rpl.c
+++ b/os/net/routing/rpl-lite/rpl.c
@@ -198,6 +198,8 @@ const struct routing_driver rpl_lite_driver = {
   init,
   rpl_dag_root_set_prefix,
   rpl_dag_root_start,
+  rpl_global_repair,
+  rpl_local_repair,
 };
 /*---------------------------------------------------------------------------*/
 
diff --git a/os/services/rpl-border-router/embedded/border-router-embedded.c b/os/services/rpl-border-router/embedded/border-router-embedded.c
index 7d6f4125f..884f60a97 100644
--- a/os/services/rpl-border-router/embedded/border-router-embedded.c
+++ b/os/services/rpl-border-router/embedded/border-router-embedded.c
@@ -88,11 +88,7 @@ PROCESS_THREAD(border_router_process, ev, data)
     PROCESS_YIELD();
     if(ev == sensors_event && data == &button_sensor) {
       LOG_INFO("Initiating global repair\n");
-#if UIP_CONF_IPV6_RPL_LITE
-      rpl_global_repair();
-#else
-      rpl_repair_root(RPL_DEFAULT_INSTANCE);
-#endif
+      NETSTACK_ROUTING.global_repair("Button press");
     }
   }
 
diff --git a/os/services/rpl-border-router/native/border-router-cmds.c b/os/services/rpl-border-router/native/border-router-cmds.c
index 8d11d725d..9d0e2eb9f 100644
--- a/os/services/rpl-border-router/native/border-router-cmds.c
+++ b/os/services/rpl-border-router/native/border-router-cmds.c
@@ -121,11 +121,7 @@ border_router_cmd_handler(const uint8_t *data, int len)
       case 'G':
         /* This is supposed to be from stdin */
         printf("Performing Global Repair...\n");
-#if UIP_CONF_IPV6_RPL_LITE
-        rpl_global_repair();
-#else
-        rpl_repair_root(RPL_DEFAULT_INSTANCE);
-#endif
+        NETSTACK_ROUTING.global_repair("Command");
         return 1;
       case 'C': {
         /* send on a set-param thing! */
diff --git a/os/services/shell/shell-commands.c b/os/services/shell/shell-commands.c
index fe5d03b3b..25812eebd 100644
--- a/os/services/shell/shell-commands.c
+++ b/os/services/shell/shell-commands.c
@@ -395,8 +395,8 @@ PT_THREAD(cmd_rpl_global_repair(struct pt *pt, shell_output_func output, char *a
 {
   PT_BEGIN(pt);
 
-  SHELL_OUTPUT(output, "Triggering RPL global repair\n")
-  rpl_global_repair();
+  SHELL_OUTPUT(output, "Triggering routing global repair\n")
+  NETSTACK_ROUTING.global_repair("Shell");
 
   PT_END(pt);
 }
@@ -406,8 +406,8 @@ PT_THREAD(cmd_rpl_local_repair(struct pt *pt, shell_output_func output, char *ar
 {
   PT_BEGIN(pt);
 
-  SHELL_OUTPUT(output, "Triggering RPL local repair\n");
-  rpl_local_repair("Shell");
+  SHELL_OUTPUT(output, "Triggering routing local repair\n");
+  NETSTACK_ROUTING.local_repair("Shell");
 
   PT_END(pt);
 }