diff --git a/FORTIFY_SOURCE_3-fix.patch b/FORTIFY_SOURCE_3-fix.patch
new file mode 100644
index 0000000..a237370
--- /dev/null
+++ b/FORTIFY_SOURCE_3-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
+index 4ea26b6..df82974 100644
+--- a/ncurses/widechar/lib_unget_wch.c
++++ b/ncurses/widechar/lib_unget_wch.c
+@@ -76,6 +76,8 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
+ 
+     init_mb(state);
+     length = _nc_wcrtomb(0, wch, &state);
++    if (length < MB_CUR_MAX)
++      length = MB_CUR_MAX;
+ 
+     if (length != (size_t) (-1)
+ 	&& length != 0) {
diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2
index 24d9cad..b0df4f3 100644
--- a/ncurses-6.3-patches.tar.bz2
+++ b/ncurses-6.3-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a24270e01a757edc9475aa87f8a33d4abc2619cbb021336a069479c5f6f00c3
-size 949354
+oid sha256:4c95ea9863018b234484759a222187cd0d02270156bff62eb98cfcf4cae37750
+size 951774
diff --git a/ncurses.changes b/ncurses.changes
index 5a567aa..b5640d4 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr 27 12:47:05 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Include FORTIFY_SOURCE_3-fix.patch as the patch
+  is needed for upcoming -D_FORTIFY_SOURCE=3 $optflag.
+  We discussed the change with upstream, but the project
+  disagrees about stricter rules used with -D_FORTIFY_SOURCE=3.
+
+-------------------------------------------------------------------
+Mon Apr 25 07:40:05 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20220423
+  + in-progress work on invalid_merge(), disable it (cf: 20220402).
+  + fix memory leak in _nc_tic_dir() when called from _nc_set_writedir().
+  + fix memory leak in tic when "-c" option is used.
+
 -------------------------------------------------------------------
 Wed Apr 20 06:37:39 UTC 2022 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/ncurses.spec b/ncurses.spec
index 3c5b2b2..e74d101 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -98,6 +98,7 @@ Source11:       ncurses.keyring
 Patch0:         ncurses-6.3.dif
 Patch1:         ncurses-5.9-ibm327x.dif
 Patch2:         ncurses-5.7-tack.dif
+Patch3:         FORTIFY_SOURCE_3-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _miscdir    %{_datadir}/misc
 %global         _incdir     %{_includedir}
@@ -350,6 +351,7 @@ mv tack-* tack
 %patch1 -p0 -b .327x
 %patch2 -p0 -b .hs
 %patch0 -p0 -b .p0
+%patch3 -p1
 %if ! %{with xtermdsl}
 sed -ri '/^xterm-suse/,/use=/{s/use=xterm-new/use=xterm-p370/;}' misc/terminfo.src
 %endif