diff --git a/SOURCES/net-snmp-5.8-engine-id.patch b/SOURCES/net-snmp-5.8-engine-id.patch
new file mode 100644
index 0000000..16c46a9
--- /dev/null
+++ b/SOURCES/net-snmp-5.8-engine-id.patch
@@ -0,0 +1,25 @@
+From 79f014464ba761e2430cc767b021993ab9379822 Mon Sep 17 00:00:00 2001
+From: Wes Hardaker <opensource@hardakers.net>
+Date: Tue, 8 Jan 2019 08:52:29 -0800
+Subject: [PATCH] NEWS: snmptrap: BUG: 2899: Patch from Drew Roedersheimer to
+ set library engineboots/time values before sending
+
+---
+ apps/snmptrap.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/apps/snmptrap.c b/apps/snmptrap.c
+index d16d2fa671..12808d07e4 100644
+--- a/apps/snmptrap.c
++++ b/apps/snmptrap.c
+@@ -237,6 +237,9 @@ main(int argc, char *argv[])
+ session.engineBoots = 1;
+ if (session.engineTime == 0) /* not really correct, */
+ session.engineTime = get_uptime(); /* but it'll work. Sort of. */
++
++ set_enginetime(session.securityEngineID, session.securityEngineIDLen,
++ session.engineBoots, session.engineTime, TRUE);
+ }
+
+ ss = snmp_add(&session,
+
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index 69cc009..6d8cbda 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -10,7 +10,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.8
-Release: 21%{?dist}
+Release: 22%{?dist}
Epoch: 1
License: BSD
@@ -67,6 +67,7 @@ Patch38: net-snmp-5.8-digest-from-ECC.patch
Patch39: net-snmp-5.8-broken-errmsg.patch
Patch40: net-snmp-5.8-intermediate-certs.patch
Patch41: net-snmp-5.8-fix-cert-crash.patch
+Patch42: net-snmp-5.8-engine-id.patch
# Modern RPM API means at least EL6
Patch101: net-snmp-5.8-modern-rpm-api.patch
@@ -233,6 +234,7 @@ rm -r python
%patch39 -p1 -b .broken-errmsg
%patch40 -p1 -b .intermediate-certs
%patch41 -p1 -b .fix-cert-crash
+%patch42 -p1 -b .engine-id
%patch101 -p1 -b .modern-rpm-api
@@ -487,6 +489,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
%changelog
+* Mon Jun 28 2021 Josef Ridky <jridky@redhat.com> - 1:5.8-22
+- update engineTime when sending traps (#1973252)
+
* Wed Jun 09 2021 Josef Ridky <jridky@redhat.com> - 1:5.8-21
- prevent parsing IP address twice (#1768908)
- add support for digests detected from ECC certs (#1919714)