diff --git a/bjnp-io.c b/bjnp-io.c
index f1b499b..7cdb33a 100644
--- a/bjnp-io.c
+++ b/bjnp-io.c
@@ -501,11 +501,8 @@ bjnp_backendGetDeviceID(printer_t *printer, char *device_id, int device_id_size,
      * Returns: 0 if ok
      *          -1 if not found
      */
-    strncpy(device_id, printer->IEEE1284_id, device_id_size);
-    device_id[device_id_size] = '\0';
-
-    strncpy(make_model, printer->model, make_model_size);
-    make_model[make_model_size] = '\0';
+    strlcpy(device_id, printer->IEEE1284_id, device_id_size);
+    strlcpy(make_model, printer->model, make_model_size);
 
     if ((strlen(make_model) == 0) && (strlen(device_id) == 0)) {
         return -1;