diff --git a/.gitignore b/.gitignore
index d900ad2..58d504c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 SOURCES/s-nail-14.9.22.tar.xz
-SOURCES/steffen.asc
diff --git a/.s-nail.metadata b/.s-nail.metadata
index 1424250..24ad43b 100644
--- a/.s-nail.metadata
+++ b/.s-nail.metadata
@@ -1,2 +1 @@
 4e50d4c17e8365c7eb7155ef7ea39d7974428001 SOURCES/s-nail-14.9.22.tar.xz
-84fd0c1332373d331b461940d0f1cc61081ea421 SOURCES/steffen.asc
diff --git a/SOURCES/s-nail-bcc-in-subject.patch b/SOURCES/s-nail-bcc-in-subject.patch
new file mode 100644
index 0000000..edaf1e4
--- /dev/null
+++ b/SOURCES/s-nail-bcc-in-subject.patch
@@ -0,0 +1,54 @@
+From c3ef40c2b63ad7785571802c4100581ebf228a1f Mon Sep 17 00:00:00 2001
+From: Steffen Nurpmeso <steffen@sdaoden.eu>
+Date: Thu, 4 Nov 2021 20:24:30 +0100
+Subject: [PATCH] a_sendout_transfer(): FIX *mta-bcc-ok* logic on follow lines!
+ (Andreas Teuber)
+
+---
+ src/mx/sendout.c | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/src/mx/sendout.c b/src/mx/sendout.c
+index 71a62ef89d..d83edb777d 100644
+--- a/src/mx/sendout.c
++++ b/src/mx/sendout.c
+@@ -1362,7 +1362,7 @@ a_sendout_transfer(struct sendbundle *sbp, boole resent, boole *senderror){
+    input_save = sbp->sb_input;
+    if((resent || (sbp->sb_hp != NIL && sbp->sb_hp->h_bcc != NIL)) &&
+          !ok_blook(mta_bcc_ok)){
+-      boole inhdr;
++      boole inhdr, inskip;
+       uz bufsize, bcnt, llen;
+       char *buf;
+       FILE *fp;
+@@ -1379,17 +1379,23 @@ a_sendout_transfer(struct sendbundle *sbp, boole resent, boole *senderror){
+       mx_fs_linepool_aquire(&buf, &bufsize);
+       bcnt = fsize(input_save);
+       inhdr = TRU1;
++      inskip = FAL0;
+       while(fgetline(&buf, &bufsize, &bcnt, &llen, input_save, TRU1) != NIL){
+          if(inhdr){
+             if(llen == 1 && *buf == '\n')
+                inhdr = FAL0;
+-            /* (We need _case for resent only) */
+-            else if(su_cs_starts_with_case(buf, "bcc:"))
+-               continue;
+-            /* We yet do not generate that, but place the logic today */
+-            else if(resent && su_cs_starts_with_case(buf, "resent-bcc:"))
+-               continue;
+-
++            else{
++               if(inskip && *buf == ' ')
++                  continue;
++               inskip = FAL0;
++               /* (We need _case for resent only);
++                * xxx We do not resent that yet , but place the logic today */
++               if(su_cs_starts_with_case(buf, "bcc:") ||
++                     (resent && su_cs_starts_with_case(buf, "resent-bcc:"))){
++                  inskip = TRU1;
++                  continue;
++               }
++            }
+          }
+          if(fwrite(buf, 1, llen, fp) != llen)
+             goto jewritebcc;
diff --git a/SOURCES/s-nail-testsuite.patch b/SOURCES/s-nail-testsuite.patch
new file mode 100644
index 0000000..c94cd4c
--- /dev/null
+++ b/SOURCES/s-nail-testsuite.patch
@@ -0,0 +1,41 @@
+diff --git a/mx-test.sh b/mx-test.sh
+index 4a26379..0cb9555 100755
+--- a/mx-test.sh
++++ b/mx-test.sh
+@@ -10017,7 +10017,7 @@ t_s_mime() {
+       # Sign/verify
+       echo bla | ${MAILX} ${ARGS} \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' ./.VERIFY >>${ERR} 2>&1
+       check_ex0 ${_z}-estat
+@@ -10028,7 +10028,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.VERIFY > "${MBOX}"
+-      check ${_z} - "${MBOX}" '335634014 644'
++      check ${_z} - "${MBOX}" '374578409 646'
+       _z=`add ${_z} 1`
+ 
+       printf 'verify\nx\n' |
+@@ -10046,7 +10046,7 @@ t_s_mime() {
+       ${MAILX} ${ARGS} \
+          -Smta=test://./.ENCRYPT \
+          -Ssmime-force-encryption -Ssmime-encrypt-recei@ver.com=./.tpair.pem \
+-         -Ssmime-sign-digest=sha1 \
++         -Ssmime-sign-digest=sha256 \
+          -Ssmime-sign -Ssmime-sign-cert=./.tpair.pem -Sfrom=test@localhost \
+          -S password-test@localhost.smime-cert-key=${_pass} \
+          -s 'S/MIME test' recei@ver.com >>${ERR} 2>&1
+@@ -10071,7 +10071,7 @@ t_s_mime() {
+          { if(!skip) print }
+       ' \
+          < ./.DECRYPT > "${MBOX}"
+-      check ${_z} - "${MBOX}" '2602978204 940'
++      check ${_z} - "${MBOX}" '101680387 942'
+       _z=`add ${_z} 1`
+ 
+       (openssl smime -decrypt ${_ossl} -inkey ./.tkey.pem -in ./.ENCRYPT |
+
diff --git a/SOURCES/steffen.asc b/SOURCES/steffen.asc
new file mode 100644
index 0000000..e78fc8b
--- /dev/null
+++ b/SOURCES/steffen.asc
@@ -0,0 +1,62 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFogZb4BEADX1RCLsdnBq0IZiNb5HZFsp2G8BnWVM2NJJFbQFI5g+aPhO+5a
+gWM2vgqn/a8zpr2OyP5/rliqMY7sxmOFEYoND0OnekXU7rVbUWpY87uK0qBxO5lo
+ErQfs8sjhjH3RNKsgXyUZVN3a4HCXL2ortS8EJvcQ/2NMAEMAHEG+V4HK+nFNB4u
+OpYa+QHLmTHOuOlhbDIw/dRCWP8o2+e60Juf6KXonA00dSoaMv6lL2UU3znvLHuF
+zYBG4fjm2Rt5gDfehCHzeWWpc/zSTDAQf4oaFfn2JXd3gd1s5k8nKn60azONjBQ7
+3dcpxcmltCYnHVohjJ/oFYSSvWG281P2Ayj67PPdekhuHhifLSut9eKVLVeUsrXo
+wc8GDULIGbsy5BMI9UyHPElB+8UnRQNe3USRCQ6Hr+SYsllLLxpL0O5MrT4ELSFF
+0u6naJzm7+Tq4AqgXcJ0x4siW5ipOwmZYWMbA1dtrgk7cFiUhLl2GWxf54ZvUA60
+D7RfajqAyFXBEGcv37JItj0pbY8R5lqn8jDPOtcdMWBKSVg9lETt+oO30bOFSQok
+QiCJc9r3bimmk+BpxK4PN3pIKKkF7Og8nggIiYzPBWVLtpGcRHOOKSYL9S6mLJPw
+dt2eU6JCNunBuT0DCgJQCsc2a0V2SA/NSPcWBqozq74QFnXxG2Qr21U7IwARAQAB
+tCVTdGVmZmVuIE51cnBtZXNvIDxzdGVmZmVuQHNkYW9kZW4uZXU+iQI9BBMBAgAn
+AhsDBgsJCAcDAgYVCAIJCgsDFgIBAh4BAheABQJbExa9BQkkqYNmAAoJEDCJZLUY
+g6DdIjoQANSSnoG7E4VRbQ/jt6k2zKi2JDnz1J0r5DCmMOI9GfGC7mzTewbarbyo
+rKsOucC+SBBW7YNvUG/p24NK55ig2iXDqmFgKSP1iZ6HrrQrcJOcqdysxk6Mh/Vb
+RroNKXYDnW6xtSrgEgHzxv2Py/4hI8p6G/bkRMZH3LIVsUS11cedOMrxyZbHZIc/
+6VOfxNvt1cd1hZGACzX7sNSjZP8vdxK2zJwKTxsQn6tHJ4RY5qdvbfxxhl1d+JLb
+rZoDjXS0DbHCNPGLyFgTfF66FqceqlprIxpXNspChaJRPkclKLp8PXPdzpGmsN54
+8xNp3Ly+cXKw+ddvi76KHNndUP4FJefSiTvk4Sopzp9JQcYk4nSu0Slu+Oy0+34g
+u7foKla0rgWNLzcLXzptkJ7/kqzi+OcZa0XKG3vTXT2MHr2/emK+675jz5e5RD4c
+vKC3v4bxDj9Wktdq15mGHIPkVXpxe7JsHM2WWBTOGzPg+CO5Svh25rnnS6SBf2bH
+/DbSPn6dfUQ98bCWTEBGDidjk1NjkRYFsJAmyw9tDk8b8orhbEBp3cSSw2bhD2Sv
+CzCwr0A9OuqQdFmbT4hEHQiCliJTdAMxc/C3EKA+MRo8dvZBWvOw43zhDVHGnrrG
+9YE0JZghAuZ1QEBBKvBFNmi3leCTltrHLaODutuHHqRPnolFBo+cuQINBFsSq/cB
+EAC0RPc7uMOo/9Mc/oIgxTjSLn68bioste9qJtO0iKJqu+5xd0FFAdlP1JzL4+r2
+nAl3qIev1EVIVx9hUeB5eLtZWR+OADmESSacdvYuPaDdLfIhqBI1kLH0jMS+lPHN
+o3bsjjGmn2av511JEB4twyMib1Isl46L14hmvbt0vPXoE8+x8EogUkg7H2pdhN4Q
+nz5j2WT0iVoMXnqG7ADeyjTOHKcJdnbmGQbdDaBBFKTE6QoYLSKX7SBb5DCmqHfo
+uN69lL/GeeHr/c9/XSy62yl/IUWvHE6TDXdGgdR/WjrYS9q5WZq0wXtoEWKGHWBD
+ewsfqvwn+K10v/ZWEjSMeFnFbEtf9ddRH7nYrrduL7G/YNXC1Pb0l8+WsVyAONBl
+urj5RXQLHdGICY0nyFH9LNY9OKnGBPIR2aRva0xU0xvpvUanxFC5s4zfvBL7on02
+cTRwOZ8W6/uiIFS6Cog3BLMjVBfg7E6ofMgTeOdfGXM63kl+tP8Mykn554fqhucw
+GwK28/jCQFTkk8zbZ9TmbD+zJEn2H4TXr92g3wzuIWEENgwhDCFa38ZpNH4t1nfK
+xh+2nK/iLBagtFH7/ljkBYoT9GEVMtyvEijpPx1mh1+CKOseI1ZPYNvjSgOBpcIH
+2xwtGjp8g9040QBpCNABBjcgy8XHvJgu6KpOZjp6vyDX0wARAQABiQQ+BBgBAgAJ
+BQJbEqv3AhsCAikJEDCJZLUYg6DdwV0gBBkBAgAGBQJbEqv3AAoJEN8IL2ruyML/
+RckP/0MYILZhSJgDz/TkrU8whK0B4EeqSI9C0k3ofjLf8VyYmWztOLPcygQmH0UO
+OqaG60T+RJlg7AjOI5AS5OoDS94VL1MQW1M41lHZO9CkV4Ww6QB0ukHHZuiOe18b
+kgS/mgySn66ALWD3gO3bZBESCKtK3JnPNo6xhR+4WUTOZy1bxRk275FFfkXPOEnf
+e3Q8iafQOtiGca16PcL8ehe7PW2RMUG0GcFIdh/L1L7I1DAmhaHzSnMUc1UVmU/q
+F/OxE6f5ZjrFCaRUxpu2jzKneGIJa/JSKKlrgZmZOjs3hZuWL6PgOFWuHeyjTHgs
+dLGXTrcFIwr3S0lc1OqsuufokmEHbSMGVfZqNtNoJUabj5DAw3e8vhKu7mQIoEZ2
+i9/CH+AWZfGmsxZIUmHXbpJAdwtqdSxbsR+rONwvy1eZMycDdC18yKE2KSoxfyti
+XN2aeMpy6CLfpcxuh/9MoACUs/O3Yft2602zs1KQaHHlrWnrhOMi/8drnh8N6K1o
+kZTc+OImBHnBBuAOsPxx478tMvU5LUW3Plw25bzNv4clZalLKQKza09Unj8HYAkh
+YeT3/usyTYfCUI6+JfcxFJ8/l4kYb0buv21ofREzpNIEEBaoS9avTk3LE7SXFjuA
+ElR3XjY0US5DXWdjt9RUyPN1j6hTn9GxJ/dRl8XOWFQ1RzahrwgP/308SgiP7mzG
+t4tRUdcQCBB3pbmBXJV7wACmawOfQddc+rbLtL+akh7VkrmPcmSMZ9chdbMUuqNE
+Auw67+YzjZJNYHlA/cHQ6PYCHxTahMFhMBOM6TIvBcuzT7iIbqF2EjXLfiESslAT
+vit7n3R/ActSu7pabcRE2Ep7UzUY28+xGkfdFOrm9X/65tGo39F2UELes4EjMvNh
+jWfR0Y7grjIF9SK3o+QgN7niM6lEvXRDXwh+RLpG4MAisJsFYbMvX6v/27HmCVEK
+ZLVOdXxPDTBmK2ap6qnIct8otCNSTB3VauSd4p/IIksP2gynWjvdzIO5p+O0M/pi
+xzvvK3OknRt2S02ShCHm8nIkGzElRhUQahSMCfT1NhWpn5IUpkpepo2WH3m0OTlA
+zbpvtn+ZmsgzCf8Ap8SmXgLR/XGQSYnYuwqA0M3tp6DM1zM9D1xtu/2/m3tsLusW
++NwJ97yZ50yoOUKd2hmKWmPH2JAea4ZtKwIE15Cq2u/1wDAqVoAKLnM5cd6yI7+B
+tbTgqI+dojGKYirC/Z5RqyvwQfmzNCcoYQLjY1g9mY7ACkBKK10tmkJ1K3SMLrwY
+kmQ2QWxpdN2N68BJ7A4GxZrT4yICuJlbXshKw3QrbAUD9CUSO7MtJFkoaIjIoHZ5
+V0T07f+MbJVGC4WaNX+cCT/V7vyMm2ue
+=GCaq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/SPECS/s-nail.spec b/SPECS/s-nail.spec
index 6287764..dff6842 100644
--- a/SPECS/s-nail.spec
+++ b/SPECS/s-nail.spec
@@ -1,6 +1,6 @@
 Name:           s-nail
 Version:        14.9.22
-Release:        6%{?dist}
+Release:        9%{?dist}
 Summary:        Environment for sending and receiving mail
 
 # Everything is ISC except parts coming from the original Heirloom mailx which are BSD
@@ -11,6 +11,11 @@ Source1:        https://www.sdaoden.eu/downloads/%{name}-%{version}.tar.xz.asc
 # https://ftp.sdaoden.eu/steffen.asc
 Source2:        steffen.asc
 
+# rhbz#2103212
+Patch0:		s-nail-testsuite.patch
+# upstream commit https://github.com/sdaoden/s-mailx/commit/c3ef40c2b63ad7785571802c4100581ebf228a1f.patch
+Patch1:		s-nail-bcc-in-subject.patch
+
 BuildRequires: make
 BuildRequires:  gnupg2
 BuildRequires:  gcc
@@ -137,6 +142,18 @@ fi
 
 
 %changelog
+* Wed Oct 29 2025 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-9
+- Stop adding BCC lines to subject
+- Resolves: RHEL-110823
+
+* Mon Aug 29 2022 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-8
+- Fix CI configuration
+- Related: rhbz#2103212
+
+* Fri Aug 26 2022 Tomas Korbar <tkorbar@redhat.com> - 14.9.22-7
+- Make s-nail testsuite use sha256
+- Resolves: rhbz#2103212
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 14.9.22-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688