diff --git a/SOURCES/rsyslog-8.2102.0-rhbz1832368-prioritize-SAN.patch b/SOURCES/rsyslog-8.2102.0-rhbz1832368-prioritize-SAN.patch
new file mode 100644
index 0000000..07eef68
--- /dev/null
+++ b/SOURCES/rsyslog-8.2102.0-rhbz1832368-prioritize-SAN.patch
@@ -0,0 +1,11 @@
+diff -up rsyslog-8.2102.0/runtime/nsd_gtls.c.orig rsyslog-8.2102.0/runtime/nsd_gtls.c
+--- rsyslog-8.2102.0/runtime/nsd_gtls.c.orig	2021-11-22 09:33:25.501668376 +0100
++++ rsyslog-8.2102.0/runtime/nsd_gtls.c	2021-11-22 09:34:18.423642573 +0100
+@@ -1791,6 +1791,7 @@ AcceptConnReq(nsd_t *pNsd, nsd_t **ppNew
+ 	pNew->gnutlsPriorityString = pThis->gnutlsPriorityString;
+ 	pNew->DrvrVerifyDepth = pThis->DrvrVerifyDepth;
+ 	pNew->dataTypeCheck = pThis->dataTypeCheck;
++	pNew->bSANpriority = pThis->bSANpriority;
+ 
+ 	/* if we reach this point, we are in TLS mode */
+ 	iRet = gtlsInitSession(pNew);
diff --git a/SPECS/rsyslog.spec b/SPECS/rsyslog.spec
index 38af939..0fed65c 100644
--- a/SPECS/rsyslog.spec
+++ b/SPECS/rsyslog.spec
@@ -6,7 +6,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.2102.0
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 ExcludeArch: i686
@@ -54,6 +54,7 @@ Patch2: rsyslog-8.2102.0-rhbz1886400-reduce-default-timeout.patch
 Patch3: rsyslog-8.2102.0-rhbz1866877-unexpected-length.patch
 Patch4: rsyslog-8.2102.0-rhbz1984616-imuxsock-ratelimit.patch
 Patch5: rsyslog-8.2102.0-rhbz1984489-remove-abort-on-id-resolution-fail.patch
+Patch6: rsyslog-8.2102.0-rhbz1832368-prioritize-SAN.patch
 
 %package crypto
 Summary: Encryption support
@@ -116,6 +117,10 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: liblognorm-devel
 
+%package mmfields
+Summary: Fields extraction module
+Requires: %name = %version-%release
+
 %package mmsnmptrapd
 Summary: Message modification module for snmptrapd generated messages
 Group: System Environment/Daemons
@@ -220,6 +225,12 @@ container metadata.
 %description mmnormalize
 This module provides the capability to normalize log messages via liblognorm.
 
+%description mmfields
+The mmfield module permits to extract fields. Using this module is of special
+advantage if a field-based log format is to be processed, like for example CEF
+and either a large number of fields is needed or a specific field is used multiple
+times inside filters.
+
 %description mmsnmptrapd
 This message modification module takes messages generated from snmptrapd and
 modifies them so that they look like they originated from the read originator.
@@ -274,6 +285,7 @@ mv build doc
 %patch3 -p1 -b .unexpected-priority-length
 %patch4 -p1 -b .imuxsock-rate-limit
 %patch5 -p1 -b .abort-on-id-resolution-fail
+%patch6 -p1 -b .prioritizeSAN
 
 %build
 %ifarch sparc64
@@ -332,6 +344,7 @@ autoreconf -if
 	--enable-mmjsonparse \
 	--enable-mmkubernetes \
 	--enable-mmnormalize \
+	--enable-mmfields \
 	--enable-mmsnmptrapd \
 	--enable-mmutf8fix \
 	--enable-mysql \
@@ -488,6 +501,9 @@ done
 %files mmnormalize
 %{_libdir}/rsyslog/mmnormalize.so
 
+%files mmfields
+%{_libdir}/rsyslog/mmfields.so
+
 %files mmsnmptrapd
 %{_libdir}/rsyslog/mmsnmptrapd.so
 
@@ -514,6 +530,15 @@ done
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Mon Nov 22 2021 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-7
+- Propagate prioritizeSAN when accepting new connection
+  resolves: rhbz#1832368
+
+* Mon Oct 18 2021 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-6
+- Enable mmfields module
+  resolves: rhbz#1947907
+  resolves: rhbz#1866900
+
 * Wed Aug 04 2021 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-5
 - Do not exit when user/group can not be found
   resolves: rhbz#1984489