diff --git a/configure b/configure
index 4d01e3421..f5185fc5b 100755
--- a/configure
+++ b/configure
@@ -682,6 +682,7 @@ SSLLIB
 HAVE_SSL
 PC_CRYPTO_DEPENDENCY
 CONFIG_DATE
+GCC_DOCKER_LINTFLAGS
 NETBSD_LINTFLAGS
 PYUNBOUND_UNINSTALL
 PYUNBOUND_INSTALL
@@ -17887,6 +17888,12 @@ fi
 if test "`uname`" = "NetBSD"; then
 	NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_'
 
+fi
+
+if test "`uname -o`" = "GNU/Linux"; then
+	# splint cannot parse modern c99 header files
+	GCC_DOCKER_LINTFLAGS='-syntax'
+
 fi
 CONFIG_DATE=`date +%Y%m%d`
 
diff --git a/doc/Changelog b/doc/Changelog
index 64621ef68..f518a972f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 12 August 2021: George
 	- Merge PR #514, from ziollek: Docker environment for run tests.
+	- For #514: generate configure.
 
 12 August 2021: Wouter
 	- And 1.13.2rc1 became the 1.13.2 with the fix for the python module