diff --git a/src/address.c b/src/address.c
index c4a4c9f..ac58b57 100644
--- a/src/address.c
+++ b/src/address.c
@@ -11,7 +11,7 @@ patty_ax25_address *patty_ax25_address_create(const char *callsign, int ssid) {
         goto error_malloc_addr;
     }
 
-    strncpy(addr->callsign, callsign, sizeof(addr->callsign));
+    memcpy(addr->callsign, callsign, sizeof(addr->callsign));
 
     addr->ssid = ssid;
     addr->last = 0;
diff --git a/src/if.c b/src/if.c
index b66b48d..f47db73 100644
--- a/src/if.c
+++ b/src/if.c
@@ -146,8 +146,7 @@ int patty_ax25_if_add_address(patty_ax25_if *iface, const char *callsign, int ss
     }
 
     memset(address, '\0', sizeof(*address));
-
-    strncpy(address->callsign, callsign, sizeof(address->callsign));
+    memcpy(address->callsign, callsign, sizeof(address->callsign));
 
     address->ssid = ssid;