diff --git a/arpwatch-2.1a15-hostname-buffer.patch b/arpwatch-2.1a15-hostname-buffer.patch
new file mode 100644
index 0000000..33fe566
--- /dev/null
+++ b/arpwatch-2.1a15-hostname-buffer.patch
@@ -0,0 +1,11 @@
+--- a/db.c	2000-10-01 01:39:58.000000000 +0200
++++ b/db.c	2024-01-03 10:29:20.367656089 +0100
+@@ -62,7 +62,7 @@
+ /* Ethernet info */
+ struct einfo {
+ 	u_char e[6];		/* ether address */
+-	char h[34];		/* simple hostname */
++	char h[64];		/* simple hostname */
+ 	time_t t;		/* timestamp */
+ };
+ 
diff --git a/arpwatch.spec b/arpwatch.spec
index 772fa02..5f9882b 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -41,6 +41,7 @@ Patch17: arpwatch-pie.patch
 Patch18: arpwatch-aarch64.patch
 Patch19: arpwatch-promisc.patch
 Patch20: arpwatch-ethernet-address-format.patch
+Patch21: arpwatch-2.1a15-hostname-buffer.patch
 
 %description
 The arpwatch package contains arpwatch and arpsnmp.  Arpwatch and
@@ -74,6 +75,7 @@ network.
 %patch18 -p1 -b .aarch64
 %patch19 -p1 -b .promisc
 %patch20 -p1 -b .ethernet-address
+%patch21 -p1 -b .hostname-buffer
 
 %build
 %configure
@@ -150,6 +152,9 @@ fi
 %attr(0644,-,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Wed Jan 03 2024 Pavel Simovec <psimovec@redhat.com> - 14:2.1a15-44
+- Increase hostname buffer
+
 * Tue Dec  3 2019 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-43
 - MAC addresses are not shown properly (#1778313)