diff --git a/net-snmp-5.8-trapsink.patch b/net-snmp-5.8-trapsink.patch
new file mode 100644
index 0000000..5027d7e
--- /dev/null
+++ b/net-snmp-5.8-trapsink.patch
@@ -0,0 +1,21 @@
+diff -urNp old/snmplib/transports/snmpUDPIPv4BaseDomain.c new/snmplib/transports/snmpUDPIPv4BaseDomain.c
+--- old/snmplib/transports/snmpUDPIPv4BaseDomain.c	2019-06-27 08:40:48.663969034 +0200
++++ new/snmplib/transports/snmpUDPIPv4BaseDomain.c	2019-06-27 08:42:05.293723487 +0200
+@@ -317,7 +317,7 @@ netsnmp_udpipv4base_tspec_transport(nets
+     if (NULL != tspec->source) {
+         struct sockaddr_in src_addr, *srcp = &src_addr;
+         /** get sockaddr from source */
+-        if (!netsnmp_sockaddr_in2(&src_addr, tspec->source, NULL))
++        if (!netsnmp_sockaddr_in2(&src_addr, tspec->source, ":0"))
+             return NULL;
+         return netsnmp_udpipv4base_transport_with_source(&addr, local, srcp);
+      } else {
+@@ -364,7 +364,7 @@ netsnmp_udpipv4base_transport(const stru
+                 strcat(client_address, ":0");
+                 have_port = 1;
+             }
+-            rc = netsnmp_sockaddr_in2(&client_addr, client_socket, NULL);
++            rc = netsnmp_sockaddr_in2(&client_addr, client_socket, ":0");
+             if (client_address != client_socket)
+                 free(client_address);
+             if(rc) {
diff --git a/net-snmp.spec b/net-snmp.spec
index fa96973..93526eb 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -44,6 +44,7 @@ Patch14:    net-snmp-5.8-python-ld-flags.patch
 Patch15:    net-snmp-5.8-ipv6-clientaddr.patch
 Patch16:    net-snmp-5.8-licensing.patch
 Patch17:    net-snmp-5.8-agent-of-death.patch
+Patch18:    net-snmp-5.8-trapsink.patch
 
 # Modern RPM API means at least EL6
 Patch101:   net-snmp-5.8-modern-rpm-api.patch
@@ -215,6 +216,7 @@ cp %{SOURCE10} .
 %patch15 -p1 -b .ipv6-clientaddr
 %patch16 -p1
 %patch17 -p1 -b .agent-of-death
+%patch18 -p1 -b .trapsink
 
 %patch101 -p1 -b .modern-rpm-api
 %patch102 -p1
@@ -488,6 +490,7 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
 * Fri Jun 28 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-10
 - remove file with unsupported license
 - fix daemon crash on resend request (#1663027)
+- fix issue with trapsink default port
 
 * Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:5.8-9
 - Rebuild for RPM 4.15