diff --git a/NEWS b/NEWS
index 7d26efbf8..d39f632c3 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ Any uppercase BUG_* names are modernish shell bug IDs.
 - Combining ((...)) with redirections no longer causes a syntax error
   due to the parser handling '>' incorrectly.
 
+- Fixed a bug that corrupted KIA/CQL cross-reference databases created using
+  ksh's -R option; shell warnings were wrongly included in the database file.
+
 2020-07-07:
 
 - Four of the date formats accepted by 'printf %()T' have had their
diff --git a/src/cmd/ksh93/sh/parse.c b/src/cmd/ksh93/sh/parse.c
index e14e4a8ff..047808bb3 100644
--- a/src/cmd/ksh93/sh/parse.c
+++ b/src/cmd/ksh93/sh/parse.c
@@ -2038,6 +2038,7 @@ unsigned long kiaentity(Lex_t *lexp,const char *name,int len,int type,int first,
 		else
 			sfputr(stkp,name,0);
 	}
+	sfputc(stkp,'\0');
 	np = nv_search(stakptr(offset),lexp->entity_tree,NV_ADD);
 	stkseek(stkp,offset);
 	np->nvalue.i = pkind;