diff --git a/ChangeLog b/ChangeLog
index c7319d8d0..e478b27ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-01-16  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* 40372: Completion/compinit: turn off POSIX_IDENTIFIERS option
+	for completion.
+
 	* 40369: Src/builtin.c: whence -v should probably quote commands
 	since it quotes functions.
 
diff --git a/Completion/compinit b/Completion/compinit
index 2715c47e8..cc663cb71 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -154,6 +154,7 @@ _comp_options=(
     NO_markdirs
     NO_octalzeroes
     NO_posixbuiltins
+    NO_posixidentifiers
     NO_shwordsplit
     NO_shglob
     NO_warncreateglobal