diff --git a/haakedriv.c b/haakedriv.c
index e38ebfe..4d28ffc 100644
--- a/haakedriv.c
+++ b/haakedriv.c
@@ -113,7 +113,7 @@ int HaakeHandler(void *object)
         if (strcmp(eab->ans, eab->version) == 0) {
           /* we are still connected with the same device */
         } else if (*eab->version == '\0') {
-          strlcat(eab->version, eab->ans, sizeof(eab->version) - 1);
+          strlcpy(eab->version, eab->ans, sizeof(eab->version));
         } else {                /* version (and therefore device) changed */
           eab->errCode = EASE_DEV_CHANGED;
           eab->state = EASE_idle;
diff --git a/linadriv.c b/linadriv.c
index 65502fd..3bcd0b4 100644
--- a/linadriv.c
+++ b/linadriv.c
@@ -72,7 +72,7 @@ int LinaHandler(void *object)
         if (strcmp(eab->ans, eab->version) == 0) {
           /* we are still connected with the same device */
         } else if (*eab->version == '\0' && strcmp(eab->ans, "7265") == 0) {
-          strlcat(eab->version, eab->ans, sizeof(eab->version) - 1);
+          strlcpy(eab->version, eab->ans, sizeof(eab->version));
         } else {                /* version (and therefore device) changed */
           eab->errCode = EASE_DEV_CHANGED;
           eab->state = EASE_idle;
diff --git a/lscsupport.c b/lscsupport.c
index b12f044..4d1d8f7 100644
--- a/lscsupport.c
+++ b/lscsupport.c
@@ -47,7 +47,7 @@ int LscHandler(void *object)
         if (strcmp(eab->ans, eab->version) == 0) {
           /* we are still connected with the same device */
         } else if (*eab->version == '\0') {
-          strlcat(eab->version, eab->ans, sizeof(eab->version) - 1);
+          strlcpy(eab->version, eab->ans, sizeof(eab->version));
         } else {                /* version (and therefore device) changed */
           eab->errCode = EASE_DEV_CHANGED;
           eab->state = EASE_idle;
diff --git a/oxinst.c b/oxinst.c
index df96a1a..a130a22 100644
--- a/oxinst.c
+++ b/oxinst.c
@@ -90,7 +90,7 @@ int OxiHandler(void *object)
         if (strcmp(eab->ans, eab->version) == 0) {
           /* we are still connected with the same device */
         } else if (*eab->version == '\0') {
-          strlcat(eab->version, eab->ans, sizeof(eab->version) - 1);
+          strlcpy(eab->version, eab->ans, sizeof(eab->version));
         } else {                /* version (and therefore device) changed */
           eab->errCode = EASE_DEV_CHANGED;
           eab->state = EASE_idle;