diff --git a/openbsc/src/gprs/gprs_subscriber.c b/openbsc/src/gprs/gprs_subscriber.c
index 2042ec6..1bb5141 100644
--- a/openbsc/src/gprs/gprs_subscriber.c
+++ b/openbsc/src/gprs/gprs_subscriber.c
@@ -157,7 +157,7 @@
 		gsub = gprs_subscr_alloc();
 		if (!gsub)
 			return NULL;
-		strncpy(gsub->imsi, imsi, sizeof(gsub->imsi));
+		osmo_strlcpy(gsub->imsi, imsi, sizeof(gsub->imsi));
 	}
 
 	if (!gsub->sgsn_data)
diff --git a/openbsc/src/libbsc/bsc_subscriber.c b/openbsc/src/libbsc/bsc_subscriber.c
index a5e40cd..73e61e8 100644
--- a/openbsc/src/libbsc/bsc_subscriber.c
+++ b/openbsc/src/libbsc/bsc_subscriber.c
@@ -80,7 +80,7 @@
 {
 	if (!bsub)
 		return;
-	strncpy(bsub->imsi, imsi, sizeof(bsub->imsi));
+	osmo_strlcpy(bsub->imsi, imsi, sizeof(bsub->imsi));
 }
 
 struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list,