diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2
index d6ad0dc..a27ad0a 100644
--- a/ncurses-6.1-patches.tar.bz2
+++ b/ncurses-6.1-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3b5702e13cc9433cb266d6c83bb1520f8dc6edf650585064f64c3335885334e
-size 224907
+oid sha256:9e7c4a4d5dbbb300b8b7fe50a05c9c1c5d614d0ae686afcea737641e7c39f065
+size 418105
diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif
index fc667b0..d709f0a 100644
--- a/ncurses-6.1.dif
+++ b/ncurses-6.1.dif
@@ -22,7 +22,7 @@
  20 files changed, 248 insertions(+), 81 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2018-06-12 09:24:41.401715250 +0000
++++ aclocal.m4	2018-06-25 09:27:41.157291350 +0000
 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
  AC_CACHE_VAL(cf_cv_type_of_bool,[
  	rm -f cf_test.out
@@ -32,7 +32,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -4813,12 +4813,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4888,12 +4888,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -50,7 +50,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -4828,7 +4831,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4903,7 +4906,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -59,7 +59,7 @@
  CF_EOF
  fi
  
-@@ -4868,7 +4871,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4943,7 +4946,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -68,7 +68,7 @@
  CF_EOF
  fi
  
-@@ -4877,23 +4880,23 @@ case "$MANPAGE_FORMAT" in
+@@ -4952,23 +4955,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -98,7 +98,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -4902,7 +4905,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4977,7 +4980,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -107,7 +107,7 @@
  							then
  								continue
  							fi
-@@ -4912,18 +4915,18 @@ CF_EOF
+@@ -4987,18 +4990,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -129,7 +129,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -4943,9 +4946,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5018,9 +5021,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -142,7 +142,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4965,6 +4968,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5040,6 +5043,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -151,8 +151,8 @@
  esac
  done
 --- configure
-+++ configure	2018-06-12 09:24:41.409715102 +0000
-@@ -5347,7 +5347,7 @@ case $cf_cv_system_name in
++++ configure	2018-06-25 09:27:41.161291278 +0000
+@@ -5351,7 +5351,7 @@ case $cf_cv_system_name in
  	fi
  	;;
  (linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -161,7 +161,7 @@
  	;;
  (openbsd[2-9].*|mirbsd*)
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -12497,12 +12497,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12909,12 +12909,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -179,7 +179,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -12512,7 +12515,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12924,7 +12927,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -188,7 +188,7 @@
  CF_EOF
  fi
  
-@@ -12552,7 +12555,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12964,7 +12967,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -197,7 +197,7 @@
  CF_EOF
  fi
  
-@@ -12561,23 +12564,23 @@ case "$MANPAGE_FORMAT" in
+@@ -12973,23 +12976,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -227,7 +227,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -12586,7 +12589,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12998,7 +13001,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -236,7 +236,7 @@
  							then
  								continue
  							fi
-@@ -12596,18 +12599,18 @@ CF_EOF
+@@ -13008,18 +13011,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -258,7 +258,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -12627,9 +12630,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13039,9 +13042,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -271,7 +271,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -12649,6 +12652,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -13061,6 +13064,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -279,7 +279,7 @@
  	;;
  esac
  done
-@@ -23083,6 +23087,7 @@ if test "$with_termlib" != no ; then
+@@ -23463,6 +23467,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -288,7 +288,7 @@
  	# the next lines are needed for linking libtic over libncurses
  	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2018-06-12 09:24:41.409715102 +0000
++++ include/curses.h.in	2018-06-25 09:27:41.161291278 +0000
 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
  typedef @cf_cv_typeof_mmask_t@ mmask_t;
  #endif
@@ -300,7 +300,7 @@
   * We need FILE, etc.  Include this before checking any feature symbols.
   */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2018-06-12 09:24:41.409715102 +0000
++++ include/termcap.h.in	2018-06-25 09:27:41.161291278 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -311,7 +311,7 @@
  
  #undef  NCURSES_OSPEED 
 --- include/tic.h
-+++ include/tic.h	2018-06-12 09:24:41.409715102 +0000
++++ include/tic.h	2018-06-25 09:27:41.161291278 +0000
 @@ -221,12 +221,12 @@ struct alias
   */
  
@@ -328,7 +328,7 @@
  #define CANCELLED_STRING	(char *)(-1)
  
 --- man/man_db.renames
-+++ man/man_db.renames	2018-06-12 09:24:41.409715102 +0000
++++ man/man_db.renames	2018-06-25 09:27:41.161291278 +0000
 @@ -163,6 +163,7 @@ term.7				term.7
  term_variables.3x		terminfo_variables.3ncurses
  terminfo.5			terminfo.5
@@ -346,7 +346,7 @@
  #
  getty.1				getty.8
 --- man/ncurses.3x
-+++ man/ncurses.3x	2018-06-12 09:24:41.409715102 +0000
++++ man/ncurses.3x	2018-06-25 09:27:41.161291278 +0000
 @@ -138,6 +138,10 @@ after the shell environment variable \fB
  [See \fBterminfo\fR(\*n) for further details.]
  .SS Datatypes
@@ -359,7 +359,7 @@
  called \fIwindows\fR, which can be thought of as two-dimensional
  arrays of characters representing all or part of a CRT screen.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2018-06-12 09:35:49.069472458 +0000
++++ misc/gen-pkgconfig.in	2018-06-25 09:27:41.161291278 +0000
 @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -399,7 +399,7 @@
  
  	if test $name = $MAIN_LIBRARY
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2018-06-12 09:24:41.409715102 +0000
++++ misc/ncurses-config.in	2018-06-25 09:27:41.161291278 +0000
 @@ -100,7 +100,7 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
@@ -410,7 +410,7 @@
  		fi
  		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2018-06-12 09:24:41.413715028 +0000
++++ misc/terminfo.src	2018-06-25 09:27:41.165291205 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -795,7 +795,7 @@
  	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
  ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
-+++ ncurses/Makefile.in	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/Makefile.in	2018-06-25 09:27:41.165291205 +0000
 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
@@ -806,7 +806,7 @@
  ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
  	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 --- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/curses.priv.h	2018-06-25 09:27:41.165291205 +0000
 @@ -2173,6 +2173,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
  extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
  extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@@ -817,7 +817,7 @@
  extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
  extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
 --- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/run_cmd.sh	2018-06-25 09:27:41.165291205 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -831,7 +831,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/tinfo/MKfallback.sh	2018-06-25 09:27:41.165291205 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -864,7 +864,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/tinfo/access.c	2018-06-25 09:27:41.165291205 +0000
 @@ -35,6 +35,9 @@
  #include <ctype.h>
  
@@ -907,7 +907,7 @@
  _nc_access(const char *path, int mode)
  {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/tinfo/lib_setup.c	2018-06-25 09:27:41.165291205 +0000
 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
      } else if ((value = tigetnum("U8")) >= 0) {
  	result = value;		/* use extension feature */
@@ -919,7 +919,7 @@
  	    result = 1;		/* always broken */
  	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/tinfo/read_entry.c	2018-06-25 09:27:41.165291205 +0000
 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
      FILE *fp = 0;
      int code;
@@ -937,7 +937,7 @@
      return (code);
  }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2018-06-12 09:24:41.413715028 +0000
++++ ncurses/tinfo/read_termcap.c	2018-06-25 09:27:41.165291205 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -984,7 +984,7 @@
      }
      if (copied != 0)
 --- progs/Makefile.in
-+++ progs/Makefile.in	2018-06-12 09:24:41.413715028 +0000
++++ progs/Makefile.in	2018-06-25 09:27:41.165291205 +0000
 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
  CFLAGS_NORMAL	= $(CCFLAGS)
  CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
@@ -1004,7 +1004,7 @@
  LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
  
 --- test/test.priv.h
-+++ test/test.priv.h	2018-06-12 09:24:41.413715028 +0000
++++ test/test.priv.h	2018-06-25 09:27:41.165291205 +0000
 @@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
diff --git a/ncurses.changes b/ncurses.changes
index e57c7b2..f8d4215 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,8 +1,34 @@
+-------------------------------------------------------------------
+Mon Jun 25 09:26:44 UTC 2018 - werner@suse.de
+
+- Add ncurses patch 6.1-20180623
+  + use _WIN32/_WIN64 in preference to __MINGW32__/__MINGW64__ symbols
+    to simplify building with MSVC, since the former are defined in both
+    compiler configurations (report by Ali Abdulkadir).
+  + further improvements to configure-checks from work on dialog, i.e.,
+    updated CF_ADD_INCDIR, CF_FIND_LINKAGE, CF_GCC_WARNINGS,
+    CF_GNU_SOURCE, CF_LARGEFILE, CF_POSIX_C_SOURCE, CF_SIZECHANGE, and
+    CF_TRY_XOPEN_SOURCE.
+  + update config.guess, config.sub from
+          http://git.savannah.gnu.org/cgit/config.git
+
+-------------------------------------------------------------------
+Mon Jun 18 08:51:13 UTC 2018 - werner@suse.de
+
+- Add ncurses patch 6.1-20180616
+  + build-fix for ncurses-examples related to gcc8-fixes (cf: 20180526).
+  + reduce use of _GNU_SOURCE for current glibc where _DEFAULT_SOURCE
+    combines with _XOPEN_SOURCE (Debian #900987).
+  + change target configure level for _XOPEN_SOURCE to 600 to address
+    use of vsscanf and setenv.
+  + improved configure-checks CF_SIZECHANGE and CF_STRUCT_TERMIOS from
+    work on dialog.
+
 -------------------------------------------------------------------
 Tue Jun 12 09:08:16 UTC 2018 - werner@suse.de
 
 - Add ncurses patch 6.1-20180609
-  + modify generatesd ncurses*config and ncurses.pc, ncursesw.pc, etc.,
+  + modify generated ncurses*config and ncurses.pc, ncursesw.pc, etc.,
     to list helper libraries such as gpm for static linking (Debian
     #900839).
   + marked vwprintw and vwscanw as deprecated; recommend using vw_printw