diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2
index deb4b76..0803dce 100644
--- a/ncurses-6.4-patches.tar.bz2
+++ b/ncurses-6.4-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:970c62c14e2ab2cd633b98a5fba32f6ca971be82cdcccdd12c5bb8fa9e1fda3a
-size 676686
+oid sha256:6719c0aa2cfdcd8e100fd5a9ae36cac065c1ddd3a077d83742ff37d4ec67ddca
+size 707934
diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif
index 16ba079..44df926 100644
--- a/ncurses-6.4.dif
+++ b/ncurses-6.4.dif
@@ -1,6 +1,6 @@
 ---
- aclocal.m4                  |   38 ++++++++-------
- configure                   |   46 +++++++++---------
+ aclocal.m4                  |   37 +++++++-------
+ configure                   |   45 +++++++++--------
  include/curses.h.in         |    5 +
  include/termcap.h.in        |    2 
  include/tic.h               |    4 -
@@ -15,11 +15,11 @@
  progs/Makefile.in           |    4 -
  test/test.priv.h            |    4 -
  test/tracemunch             |    2 
- 16 files changed, 207 insertions(+), 70 deletions(-)
+ 16 files changed, 203 insertions(+), 72 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2023-04-24 06:50:39.671979319 +0000
-@@ -5992,12 +5992,15 @@ cat >>$cf_edit_man <<CF_EOF
++++ aclocal.m4	2023-05-15 09:12:36.855207662 +0000
+@@ -5992,12 +5992,12 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -31,13 +31,10 @@
  cat >>$cf_edit_man <<CF_EOF
 +for t in \$cf_target; do
 +	t="\$cf_subdir\${section}/\${t}"
-+CF_EOF
-+
-+cat >>$cf_edit_man <<CF_EOF
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -6007,7 +6010,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -6007,7 +6007,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -46,7 +43,7 @@
  CF_EOF
  fi
  
-@@ -6047,7 +6050,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -6047,7 +6047,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_manpage_so_strip \$TMP
  	fi
  	fi
@@ -55,7 +52,7 @@
  CF_EOF
  fi
  
-@@ -6056,23 +6059,23 @@ case "$MANPAGE_FORMAT" in
+@@ -6056,31 +6056,31 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test "\$form" = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -69,6 +66,15 @@
  cat >>$cf_edit_man <<CF_EOF
 -	suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\`
 +	suffix=\`basename "\$t" | sed -e 's%^[[^.]]*%%'\`
+ 	extra_suffix=
+ 	if test -n "$EXTRA_SUFFIX" ; then
+-		case \$cf_target in
++		case \$t in
+ 		(*${EXTRA_SUFFIX}\$suffix)
+ 			extra_suffix="$EXTRA_SUFFIX"
+ 			;;
+ 		esac
+ 	fi
  	if test "\$verb" = installing ; then
 -		echo "\$verb \$cf_target"
 -		\$INSTALL_DATA \$TMP "\$cf_target"
@@ -85,7 +91,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -6081,7 +6084,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -6090,7 +6090,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -94,7 +100,7 @@
  							then
  								continue
  							fi
-@@ -6091,18 +6094,18 @@ CF_EOF
+@@ -6100,18 +6100,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -116,7 +122,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_manpage_compress" ; then
-@@ -6122,9 +6125,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -6131,9 +6131,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -129,7 +135,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -6144,6 +6147,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -6154,6 +6154,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -138,7 +144,7 @@
  esac
  done
 --- configure
-+++ configure	2023-04-24 06:52:13.042243156 +0000
++++ configure	2023-05-15 09:14:30.917179621 +0000
 @@ -6438,7 +6438,7 @@ echo $ECHO_N "checking for an rpath opti
  		fi
  		;;
@@ -168,7 +174,7 @@
  	do
  
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
-@@ -15237,12 +15237,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15237,12 +15237,12 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -180,13 +186,10 @@
  cat >>$cf_edit_man <<CF_EOF
 +for t in \$cf_target; do
 +	t="\$cf_subdir\${section}/\${t}"
-+CF_EOF
-+
-+cat >>$cf_edit_man <<CF_EOF
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -15252,7 +15255,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15252,7 +15252,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -195,7 +198,7 @@
  CF_EOF
  fi
  
-@@ -15292,7 +15295,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15292,7 +15292,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_manpage_so_strip \$TMP
  	fi
  	fi
@@ -204,7 +207,7 @@
  CF_EOF
  fi
  
-@@ -15301,23 +15304,23 @@ case "$MANPAGE_FORMAT" in
+@@ -15301,31 +15301,31 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test "\$form" = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -218,6 +221,15 @@
  cat >>$cf_edit_man <<CF_EOF
 -	suffix=\`basename "\$cf_target" | sed -e 's%^[^.]*%%'\`
 +	suffix=\`basename "\$t" | sed -e 's%^[^.]*%%'\`
+ 	extra_suffix=
+ 	if test -n "$EXTRA_SUFFIX" ; then
+-		case \$cf_target in
++		case \$t in
+ 		(*${EXTRA_SUFFIX}\$suffix)
+ 			extra_suffix="$EXTRA_SUFFIX"
+ 			;;
+ 		esac
+ 	fi
  	if test "\$verb" = installing ; then
 -		echo "\$verb \$cf_target"
 -		\$INSTALL_DATA \$TMP "\$cf_target"
@@ -234,7 +246,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -15326,7 +15329,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15335,7 +15335,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -243,7 +255,7 @@
  							then
  								continue
  							fi
-@@ -15336,18 +15339,18 @@ CF_EOF
+@@ -15345,18 +15345,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -265,7 +277,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_manpage_compress" ; then
-@@ -15367,9 +15370,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15376,9 +15376,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -278,7 +290,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -15389,6 +15392,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -15399,6 +15399,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
diff --git a/ncurses.changes b/ncurses.changes
index f3e0537..be0142e 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon May 22 06:21:42 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20230520
+  + fixes for compiler warnings in MinGW environments.
+
+-------------------------------------------------------------------
+Mon May 15 09:05:32 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20230514
+  + modify test-package "ncurses6-doc" to use manpage-aliases, which in
+    turn required a change to the configure script to factor in the
+    extra-suffix option when deriving alias names.
+  + add mode 1004 to xterm+sm+1006 from xterm #380 -TD
+- Port and correct offsets of patch ncurses-6.4.dif
+
 -------------------------------------------------------------------
 Mon May  8 08:51:32 UTC 2023 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/ncurses.spec b/ncurses.spec
index 4d8cae6..30c6fad 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -520,6 +520,7 @@ export CFLAGS_SHARED
 	--with-normal		\
 	--with-manpage-renames=${PWD}/man/man_db.renames.in	\
 	--with-manpage-aliases	\
+	--with-manpage-symlinks	\
 	--with-ospeed=speed_t	\
 %if 0%{?suse_version} > 1310
 	--with-gpm=$(readlink %{_libdir}/libgpm.so) \