diff --git a/NEWS b/NEWS
index d04460288..0d35bb77e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,14 @@ For full details, see the git log at: https://github.com/ksh93/ksh
 
 Any uppercase BUG_* names are modernish shell bug IDs.
 
+2020-08-09:
+
+- File name generation (a.k.a. pathname expansion, a.k.a. globbing) now
+  never matches the special navigational names '.' (current directory) and
+  '..' (parent directory). This change makes a pattern like .* useful; it
+  now matches all hidden files (dotfiles) in the current directory, without
+  the harmful inclusion of '.' and '..'.
+
 2020-08-08:
 
 - Argument checking in the 'redirect' builtin command (see 2020-06-11) has
diff --git a/src/cmd/ksh93/include/version.h b/src/cmd/ksh93/include/version.h
index 9c60971ab..191237b43 100644
--- a/src/cmd/ksh93/include/version.h
+++ b/src/cmd/ksh93/include/version.h
@@ -17,4 +17,4 @@
 *                  David Korn <dgk@research.att.com>                   *
 *                                                                      *
 ***********************************************************************/
-#define SH_RELEASE	"93u+m 2020-08-08"
+#define SH_RELEASE	"93u+m 2020-08-09"
diff --git a/src/cmd/ksh93/sh.1 b/src/cmd/ksh93/sh.1
index 000cb2975..3e3c540ef 100644
--- a/src/cmd/ksh93/sh.1
+++ b/src/cmd/ksh93/sh.1
@@ -2426,6 +2426,11 @@ that component of the filename is left unchanged unless
 the pattern is prefixed with
 .B \(ap(N)\fP
 in which case it is removed as described below.
+The special traversal names
+.B .
+and
+.B ..
+are never matched.
 If
 .SM
 .B FIGNORE
@@ -2435,11 +2440,6 @@ that matches the pattern defined by the value of
 .SM
 .B FIGNORE
 is ignored when generating the matching filenames.
-The names
-.B .
-and
-.B ..
-are also ignored.
 If
 .SM
 .B FIGNORE
diff --git a/src/cmd/ksh93/tests/glob.sh b/src/cmd/ksh93/tests/glob.sh
index 8dec730ae..a42f468b3 100755
--- a/src/cmd/ksh93/tests/glob.sh
+++ b/src/cmd/ksh93/tests/glob.sh
@@ -276,10 +276,18 @@ test_glob '<Beware> <abc> <abe> <bdir> <ca> <de> <man>' *
 
 FIGNORE=
 test_glob '<man/man1/sh.1>' */man*/sh.*
+test_glob '<.x> <.y> <Beware> <a> <a-b> <aXb> <abc> <abd> <abe> <b> <bb> <bcd> <bdir> <c> <ca> <cb> <d> <dd> <de> <man>' *
+test_glob '<.x> <.y>' .*
+
+FIGNORE='@(*[abcd]*)'
+test_glob '<.x> <.y>' *
+test_glob '<.x> <.y>' .*
 
 unset FIGNORE
 test_glob '<bb> <ca> <cb> <dd> <de>' ??
 test_glob '<man/man1/sh.1>' */man*/sh.*
+test_glob '<Beware> <a> <a-b> <aXb> <abc> <abd> <abe> <b> <bb> <bcd> <bdir> <c> <ca> <cb> <d> <dd> <de> <man>' *
+test_glob '<.x> <.y>' .*
 
 GLOBIGNORE='.*:*'
 set -- *
diff --git a/src/lib/libast/misc/glob.c b/src/lib/libast/misc/glob.c
index f05b40e8e..b9fcea38d 100644
--- a/src/lib/libast/misc/glob.c
+++ b/src/lib/libast/misc/glob.c
@@ -528,11 +528,13 @@ skip:
 				*restore2 = gp->gl_delim;
 			while ((name = (*gp->gl_dirnext)(gp, dirf)) && !*gp->gl_intr)
 			{
+				if (name[0] == '.' && (!name[1] || name[1] == '.' && !name[2]))
+					continue;  /* do not ever match '.' or '..' */
 				if (notdir = (gp->gl_status & GLOB_NOTDIR))
 					gp->gl_status &= ~GLOB_NOTDIR;
 				if (ire && !regexec(ire, name, 0, NiL, 0))
 					continue;
-				if (matchdir && (name[0] != '.' || name[1] && (name[1] != '.' || name[2])) && !notdir)
+				if (matchdir && !notdir)
 					addmatch(gp, prefix, name, matchdir, NiL, anymeta);
 				if (!regexec(pre, name, 0, NiL, 0))
 				{