diff --git a/NEWS b/NEWS
index d9e30be6..60fc87e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
--- $Id: NEWS,v 1.471 1999/07/31 23:21:48 tom Exp $
+-- $Id: NEWS,v 1.472 1999/08/15 01:46:58 tom Exp $
 
 This is a log of changes that ncurses has gone through since Zeyd started
 working with Pavel Curtis' original work, pcurses, in 1992.
@@ -6,6 +6,11 @@ working with Pavel Curtis' original work, pcurses, in 1992.
 Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
 Changes since 1.9.9e are recorded by Thomas Dickey.
 
+990814	pre-release
+	+ add ms-vt100 terminfo entry -TD
+	+ minor fixes for misc/emx.src, based on testing with tack.
+	+ minor fix for test/ncurses.c, test 'a', in case ncv is not set.
+
 990731	pre-release
 	+ minor correction for 'screen' terminfo entry.
 	+ clarify description of errret values for setupterm in manpage.
diff --git a/dist.mk b/dist.mk
index 3684fbf6..f778be46 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.160 1999/07/31 18:14:57 tom Exp $
+# $Id: dist.mk,v 1.161 1999/08/14 22:57:49 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -10,7 +10,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 0
-NCURSES_PATCH = 990731
+NCURSES_PATCH = 990814
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/misc/emx.src b/misc/emx.src
index d091a17c..7319f5d8 100644
--- a/misc/emx.src
+++ b/misc/emx.src
@@ -1,4 +1,4 @@
-# $Id: emx.src,v 1.5 1998/09/26 23:59:12 tom Exp $
+# $Id: emx.src,v 1.6 1999/08/15 01:56:54 tom Exp $
 # This is a reformatted copy of the terminfo source for OS/2 EMX from
 # Juan Jose Garcia Ripoll <worm@arrakis.es>.
 # http://www.arrakis.es/~worm/
@@ -209,6 +209,7 @@ ansi.sys|ANSI.SYS 3.1 and later versions,
 # no_color_video to inform the application that standout(1), underline(2)
 # reverse(4) and invisible(64) don't work with color.
 emx-base|DOS special keys,
+	bw,
 	ncv#71,
 	bel=^G,
 	ka1=\0G,
@@ -301,7 +302,7 @@ ansi|ANSI.SYS color,
 	rmso=\E[0m,
 	rmul@,
 	sgr0=\E[0m,
-	smcup=\E[0;30;47m,
+	smcup=\E[0;37;40m,
 	smso=\E[7m,
 	smul@,
 	use=emx-base,
@@ -310,10 +311,10 @@ window|ANSI.SYS window,
 	bold=\E[1;37;47m,
 	rev=\E[1;37;47m,
 	rmcup=\E[0m,
-	rmso=\E[0;30;47m,
-	rmul=\E[0;30;47m,
-	sgr0=\E[0;30;47m,
-	smcup=\E[0;30;47m,
+	rmso=\E[0;37;40m,
+	rmul=\E[0;37;40m,
+	sgr0=\E[0;37;40m,
+	smcup=\E[0;37;40m,
 	smso=\E[1;37;47m,
 	smul=\E[1;31;47m,
 	use=emx-base,
diff --git a/misc/terminfo.src b/misc/terminfo.src
index f6b98acb..010105df 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -3,7 +3,7 @@
 # This version of terminfo.src is distributed with ncurses.
 #
 #	Version 10.2.1
-#	$Date: 1999/07/31 21:55:35 $
+#	$Date: 1999/08/15 01:42:52 $
 #	terminfo syntax
 #
 #	Eric S. Raymond		(current maintainer)
@@ -2097,6 +2097,14 @@ teraterm|Tera Term Pro,
 	vpa=\E[%i%p1%dd, 
 	use=klone+color, use=vt100, 
 
+# Tested with WinNT 4.0, the telnet application assumes the screensize is
+# 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
+ms-vt100|MS telnet imitating dec vt100, 
+	lines#25, 
+	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, 
+	tbc@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?6c, u9=\E[c, 
+	use=vt100, 
+
 #### X terminal emulators
 #
 # You can add the following line to your .Xdefaults to change the terminal type
@@ -17232,6 +17240,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 1999/7/31
 #	* corrected cnorm, added el1 in 'screen' description -TD
 #
+# 1999/8/14
+#	* add ms-vt100 -TD
+#
 # The following sets edit modes for GNU EMACS.
 # Local Variables:
 # fill-prefix:"\t"
diff --git a/test/ncurses.c b/test/ncurses.c
index c410fbd9..667d2ef6 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -39,7 +39,7 @@ DESCRIPTION
 AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
 
-$Id: ncurses.c,v 1.117 1999/07/31 21:00:47 tom Exp $
+$Id: ncurses.c,v 1.118 1999/08/10 00:37:30 tom Exp $
 
 ***************************************************************************/
 
@@ -368,7 +368,7 @@ static int show_attr(int row, int skip, chtype attr, const char *name, bool once
     if (attr != A_NORMAL) {
 	if (!(termattrs() & attr)) {
 	    printw(" (N/A)");
-	} else if (ncv && (getbkgd(stdscr) & A_COLOR)) {
+	} else if (ncv > 0 && (getbkgd(stdscr) & A_COLOR)) {
 	    static const attr_t table[] = {
 		A_STANDOUT,
 		A_UNDERLINE,