diff --git a/examples/rpl-border-router/webserver/httpd-simple.c b/examples/rpl-border-router/webserver/httpd-simple.c
index 7ce984e6a3fd9411cc4a69b5520a2bbb46d4bddc..d7bb40ca80bd5578b42b48e41dab9cb46c5e348a 100644
--- a/examples/rpl-border-router/webserver/httpd-simple.c
+++ b/examples/rpl-border-router/webserver/httpd-simple.c
@@ -175,7 +175,8 @@ PT_THREAD(handle_input(struct httpd_state *s))
     s->filename[sizeof(s->filename) - 1] = '\0';
   } else {
     s->inputbuf[PSOCK_DATALEN(&s->sin) - 1] = 0;
-    strncpy(s->filename, s->inputbuf, sizeof(s->filename));
+    strncpy(s->filename, s->inputbuf, sizeof(s->filename) - 1);
+    s->filename[sizeof(s->filename) - 1] = '\0';
   }
 #endif /* URLCONV */
 
diff --git a/os/services/rpl-border-router/native/slip-config.c b/os/services/rpl-border-router/native/slip-config.c
index 7797a129f4e635b8530beea4725d4402ec7faf92..9186e90c4ed072b0f93d5e07e8b47c815b55da3b 100644
--- a/os/services/rpl-border-router/native/slip-config.c
+++ b/os/services/rpl-border-router/native/slip-config.c
@@ -97,10 +97,11 @@ slip_config_handle_arguments(int argc, char **argv)
 
     case 't':
       if(strncmp("/dev/", optarg, 5) == 0) {
-        strncpy(slip_config_tundev, optarg + 5, sizeof(slip_config_tundev));
+        strncpy(slip_config_tundev, optarg + 5, sizeof(slip_config_tundev) - 1);
       } else {
-        strncpy(slip_config_tundev, optarg, sizeof(slip_config_tundev));
+        strncpy(slip_config_tundev, optarg, sizeof(slip_config_tundev) - 1);
       }
+      slip_config_tundev[sizeof(slip_config_tundev) - 1] = '\0';
       break;
 
     case 'a':
diff --git a/os/services/rpl-border-router/native/tun-bridge.c b/os/services/rpl-border-router/native/tun-bridge.c
index 26bc80bd77f2ff6967089b00a68e5582dd30d010..8d394ca537c83da695e12786db921496433b3a45 100644
--- a/os/services/rpl-border-router/native/tun-bridge.c
+++ b/os/services/rpl-border-router/native/tun-bridge.c
@@ -165,7 +165,7 @@ tun_alloc(char *dev)
    */
   ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
   if(*dev != 0) {
-    strncpy(ifr.ifr_name, dev, IFNAMSIZ);
+    strncpy(ifr.ifr_name, dev, IFNAMSIZ - 1);
   }
 
   if((err = ioctl(fd, TUNSETIFF, (void *)&ifr)) < 0) {