diff --git a/SOURCES/rsyslog-8.2102.0-rhbz2021076-prioritize-SAN.patch b/SOURCES/rsyslog-8.2102.0-rhbz2021076-prioritize-SAN.patch
new file mode 100644
index 0000000..20817c6
--- /dev/null
+++ b/SOURCES/rsyslog-8.2102.0-rhbz2021076-prioritize-SAN.patch
@@ -0,0 +1,11 @@
+diff -up ./rsyslog-8.2102.0/runtime/nsd_gtls.c.ori ./rsyslog-8.2102.0/runtime/nsd_gtls.c
+--- rsyslog-8.2102.0/runtime/nsd_gtls.c.ori	2022-01-17 15:50:08.285827256 +0100
++++ rsyslog-8.2102.0/runtime/nsd_gtls.c	2022-01-17 15:52:33.282594512 +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 bdd7654..2834bd5 100644
--- a/SPECS/rsyslog.spec
+++ b/SPECS/rsyslog.spec
@@ -5,7 +5,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.2102.0
-Release: 10%{?dist}
+Release: 101%{?dist}
 License: (GPLv3+ and ASL 2.0)
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@ Patch3: rsyslog-8.2102.0-rhbz1886400-reduce-default-timeout.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-rhbz1938863-covscan.patch
+Patch7: rsyslog-8.2102.0-rhbz2021076-prioritize-SAN.patch
 
 BuildRequires: make
 BuildRequires: gcc
@@ -69,6 +70,10 @@ Summary: ElasticSearch output module for rsyslog
 Requires: %name = %version-%release
 BuildRequires: libcurl-devel
 
+%package mmfields
+Summary: Fields extraction module
+Requires: %name = %version-%release
+
 %package mmjsonparse
 Summary: JSON enhanced logging support
 Requires: %name = %version-%release
@@ -187,6 +192,12 @@ in various settings.
 This message modification module takes messages generated from snmptrapd and
 modifies them so that they look like they originated from the read originator.
 
+%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 mysql
 The rsyslog-mysql package contains a dynamic shared object that will add
 MySQL database support to rsyslog.
@@ -252,6 +263,7 @@ mv build doc
 %patch4 -p1 -b .imuxsock-rate-limit
 %patch5 -p1 -b .abort-on-id-resolution-fail
 %patch6 -p1 -b .covscan
+%patch7 -p1 -b .prioritize-SAN
 
 pushd ..
 %patch0 -p1 -b .openssl-compatibility
@@ -323,6 +335,7 @@ autoreconf -if
 	--enable-mmkubernetes \
 	--enable-mmjsonparse \
 	--enable-mmnormalize \
+	--enable-mmfields \
 	--enable-mmsnmptrapd \
 	--enable-mmutf8fix \
 	--enable-mysql \
@@ -466,6 +479,9 @@ done
 %files mmnormalize
 %{_libdir}/rsyslog/mmnormalize.so
 
+%files mmfields
+%{_libdir}/rsyslog/mmfields.so
+
 %files mmsnmptrapd
 %{_libdir}/rsyslog/mmsnmptrapd.so
 
@@ -512,6 +528,14 @@ done
 
 
 %changelog
+* Wed Jan 19 2022 Sergio Arroutbi <sarroutb@redhat.com> - 8.2102.0-101
+- Prioritize SAN
+  resolves: rhbz#2021076
+
+* Mon Jan 17 2022 Sergio Arroutbi <sarroutb@redhat.com> - 8.2102.0-100
+- Enable mmfields module
+  resolves: rhbz#2027971
+
 * Tue Oct 26 2021 Davide Cavalca <dcavalca@centosproject.org> - 8.2102.0-10
 - Split out logrotate config and dependency into a subpackage
   resolves: rhbz#1992155