diff --git a/linuxptp-zerolength.patch b/linuxptp-zerolength.patch
new file mode 100644
index 0000000..0ab5ed4
--- /dev/null
+++ b/linuxptp-zerolength.patch
@@ -0,0 +1,37 @@
+commit 9633ab52460f58c92c6daa35e9d24e4ce9c5ab1c
+Author: Miroslav Lichvar <mlichvar@redhat.com>
+Date:   Tue Feb 23 11:01:43 2021 +0100
+
+    sk: Don't return error for zero-length messages.
+    
+    The recvmsg() call can return zero for a zero-length UDP message, which
+    should be handled as a bad message and not a fault of the port. This was
+    addressed in commit 6b61ba29c78e ("Avoid fault when receiving zero
+    length packets"), but later regressed in commit a6e0b83bd503
+    ("sk: Convey transmit path errors to the caller.").
+    
+    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
+    Fixes: a6e0b83bd503 ("sk: Convey transmit path errors to the caller.")
+
+diff --git a/sk.c b/sk.c
+index c9ef4d2..8be0708 100644
+--- a/sk.c
++++ b/sk.c
+@@ -391,7 +391,7 @@ int sk_receive(int fd, void *buf, int buflen,
+ 
+ 	if (!ts) {
+ 		memset(&hwts->ts, 0, sizeof(hwts->ts));
+-		return cnt < 1 ? -errno : cnt;
++		return cnt < 0 ? -errno : cnt;
+ 	}
+ 
+ 	switch (hwts->type) {
+@@ -407,7 +407,7 @@ int sk_receive(int fd, void *buf, int buflen,
+ 		hwts->ts = timespec_to_tmv(ts[1]);
+ 		break;
+ 	}
+-	return cnt < 1 ? -errno : cnt;
++	return cnt < 0 ? -errno : cnt;
+ }
+ 
+ int sk_set_priority(int fd, int family, uint8_t dscp)
diff --git a/linuxptp.spec b/linuxptp.spec
index 0821d40..94cfb17 100644
--- a/linuxptp.spec
+++ b/linuxptp.spec
@@ -20,6 +20,9 @@ Source10:	https://github.com/mlichvar/linuxptp-testsuite/archive/%{testsuite_ver
 # simulator for test suite
 Source11:	https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
 
+# fix handling of zero-length messages
+Patch1:		linuxptp-zerolength.patch
+
 BuildRequires:	gcc gcc-c++ systemd
 BuildRequires:	net-snmp-devel
 BuildRequires: make
@@ -35,6 +38,7 @@ Supporting legacy APIs and other platforms is not a goal.
 
 %prep
 %setup -q -a 10 -a 11 -n %{name}-%{!?gitfullver:%{version}}%{?gitfullver}
+%patch1 -p1 -b .zerolength
 mv linuxptp-testsuite-%{testsuite_ver}* testsuite
 mv clknetsim-%{clknetsim_ver}* testsuite/clknetsim