diff --git a/config/Makefile.in b/config/Makefile.in
index 9b1454986..51586bda2 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -124,7 +124,7 @@ am__can_run_installinfo = \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+	config.sub install-sh ltmain.sh missing mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
diff --git a/configure b/configure
index 5cfcc4260..627e064ee 100755
--- a/configure
+++ b/configure
@@ -17143,6 +17143,7 @@ then
 			-Wanalyzer-file-leak \
 			-Wanalyzer-free-of-non-heap \
 			-Wanalyzer-malloc-leak \
+			-Wanalyzer-possible-null-dereference \
 			-Wanalyzer-mismatching-deallocation \
 			-Wanalyzer-null-dereference \
 			-Wanalyzer-null-argument \
@@ -17150,6 +17151,7 @@ then
 			-Wanalyzer-shift-count-negative \
 			-Wanalyzer-overflow \
 			-Wanalyzer-stale-setjmp-buffer \
+			-Wanalyzer-tainted-array-index \
 			-Wanalyzer-unsafe-call-within-signal-handler \
 			-Wanalyzer-use-after-free \
 			-Wanalyzer-use-of-pointer-in-stale-stack-frame \
diff --git a/configure.ac b/configure.ac
index 1704b9b38..cd016bc2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,14 +157,16 @@ then
 
 		# "Iffy" g++ options.  Some reasonably current g++-like
 		# compilers may not support these.
-# TODO: Once false positive in std lib is fixed, simplify to "-fanalyzer".
+		# The -fanalyzer one is a macro option for many of the others.
 		add_compiler_opts_if_ok \
+			-fanalyzer \
 			-Wanalyzer-double-fclose \
 			-Wanalyzer-double-free \
 			-Wanalyzer-exposure-through-output-file \
 			-Wanalyzer-file-leak \
 			-Wanalyzer-free-of-non-heap \
 			-Wanalyzer-malloc-leak \
+			-Wanalyzer-possible-null-dereference \
 			-Wanalyzer-mismatching-deallocation \
 			-Wanalyzer-null-dereference \
 			-Wanalyzer-null-argument \
@@ -172,6 +174,7 @@ then
 			-Wanalyzer-shift-count-negative \
 			-Wanalyzer-overflow \
 			-Wanalyzer-stale-setjmp-buffer \
+			-Wanalyzer-tainted-array-index \
 			-Wanalyzer-unsafe-call-within-signal-handler \
 			-Wanalyzer-use-after-free \
 			-Wanalyzer-use-of-pointer-in-stale-stack-frame \