diff --git a/dhtest-1.5-strncpy.patch b/dhtest-1.5-strncpy.patch
new file mode 100644
index 0000000..0af506a
--- /dev/null
+++ b/dhtest-1.5-strncpy.patch
@@ -0,0 +1,91 @@
+From 6c74f3167f5e5d6bb65430740447a9b4d9167d0e Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Mon, 2 Mar 2020 15:11:20 +0100
+Subject: [PATCH] Fix strncpy boundaries
+
+Use memcpy for single byte operations where strncpy does not make sense.
+Make sure strncpy uses one byte less than buffer size, ensures
+terminating zero is always present.
+---
+ functions.c | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/functions.c b/functions.c
+index 3d1e486..6d72d02 100644
+--- a/functions.c
++++ b/functions.c
+@@ -614,8 +614,8 @@ int build_option53(int msg_type)
+ 		u_int8_t msg = DHCP_MSGDISCOVER;
+ 
+ 		memcpy(dhopt_buff, &msgtype, 1);
+-                strncpy((char *) (dhopt_buff + 1), (char *) &msglen, 1);
+-                strncpy((char *) (dhopt_buff + 2), (char *) &msg, 1);
++                memcpy(dhopt_buff + 1, &msglen, 1);
++                memcpy(dhopt_buff + 2, &msg, 1);
+ 		dhopt_size = dhopt_size + 3; 
+ 	} else if(msg_type == DHCP_MSGREQUEST) {
+ 		u_int8_t msgtype = DHCP_MESSAGETYPE;
+@@ -623,8 +623,8 @@ int build_option53(int msg_type)
+ 		u_int8_t msg = DHCP_MSGREQUEST;
+ 
+ 		memcpy(dhopt_buff, &msgtype, 1);
+-                strncpy((char *) (dhopt_buff + 1), (char *) &msglen, 1);
+-                strncpy((char *) (dhopt_buff + 2), (char *) &msg, 1);
++                memcpy(dhopt_buff + 1, &msglen, 1);
++                memcpy(dhopt_buff + 2, &msg, 1);
+ 		dhopt_size = dhopt_size + 3; 
+ 	} else if(msg_type == DHCP_MSGRELEASE) {
+ 		u_int8_t msgtype = DHCP_MESSAGETYPE;
+@@ -632,8 +632,8 @@ int build_option53(int msg_type)
+ 		u_int8_t msg = DHCP_MSGRELEASE;
+ 
+ 		memcpy(dhopt_buff, &msgtype, 1);
+-                strncpy((char *) (dhopt_buff + 1), (char *) &msglen, 1);
+-                strncpy((char *) (dhopt_buff + 2), (char *) &msg, 1);
++                memcpy(dhopt_buff + 1, &msglen, 1);
++                memcpy(dhopt_buff + 2, &msg, 1);
+ 		dhopt_size = dhopt_size + 3; 
+ 	} else if(msg_type == DHCP_MSGDECLINE) {
+ 		u_int8_t msgtype = DHCP_MESSAGETYPE;
+@@ -641,8 +641,8 @@ int build_option53(int msg_type)
+ 		u_int8_t msg = DHCP_MSGDECLINE;
+ 
+ 		memcpy(dhopt_buff, &msgtype, 1);
+-                strncpy((char *) (dhopt_buff + 1), (char *) &msglen, 1);
+-                strncpy((char *) (dhopt_buff + 2), (char *) &msg, 1);
++                memcpy(dhopt_buff + 1, &msglen, 1);
++                memcpy(dhopt_buff + 2, &msg, 1);
+ 		dhopt_size = dhopt_size + 3; 
+ 	}
+ 	return 0;
+@@ -1142,7 +1142,7 @@ int build_packet(int pkt_type)
+ 		u_int32_t ip_addr_tmp;
+ 		ip_addr_tmp = htonl(ip_address);
+ 		memcpy(arph->sender_mac, iface_mac, ETHER_ADDR_LEN);
+-		memcpy(arph->sender_ip, (u_char *)&ip_addr_tmp, ETHER_ADDR_LEN);
++		memcpy(arph->sender_ip, (u_char *)&ip_addr_tmp, IP_ADDR_LEN);
+ 		memcpy(arph->target_mac, arp_hg->sender_mac, ETHER_ADDR_LEN);
+ 		memcpy(arph->target_ip, arp_hg->sender_ip, IP_ADDR_LEN);
+ 	} else if(ICMP_SEND) {
+@@ -1810,7 +1810,7 @@ int get_if_mac_address(char *if_name, uint8_t *mac_address)
+ 
+   // get the mac address ot the interface
+   memset(&ifr, 0, sizeof(ifr));
+-  strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
++  strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name)-1);
+   if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) != 0)
+     {
+       perror("Error getting interface's MAC address:");
+@@ -1846,7 +1846,8 @@ int str2mac(char *str, uint8_t *mac_addr)
+   if(!str || !mac_addr)
+     return 1;
+ 
+-  strncpy(local_mac_str, str, 25);
++  strncpy(local_mac_str, str, 24);
++  local_mac_str[24] = 0x00;
+ 
+   // replace semicolons with end of string character
+   local_mac_str[2] =  local_mac_str[5] =  local_mac_str[8] =  local_mac_str[11] =  local_mac_str[14] = 0x00;
+-- 
+2.21.1
+
diff --git a/dhtest.spec b/dhtest.spec
index 7449d69..c26d9b8 100644
--- a/dhtest.spec
+++ b/dhtest.spec
@@ -7,6 +7,7 @@ License:	GPLv2
 URL:		https://github.com/saravana815/dhtest
 Source0:	https://github.com/saravana815/dhtest/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch1:		dhtest-1.5-globals.patch
+Patch2:		dhtest-1.5-strncpy.patch
 
 BuildRequires:	gcc
 
@@ -39,6 +40,7 @@ mkdir -p %{buildroot}%{_bindir}
 %changelog
 * Mon Mar 02 2020 Petr Menšík <pemensik@redhat.com> - 1.5-4
 - Fix link errors (#1799278)
+- Correct some strncpy usage errors
 
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild