diff --git a/Makefile.config.in b/Makefile.config.in
index 44296a466d2..2cc69dcf4cf 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -313,7 +313,7 @@ endif
 # Location of the plugin header file for gold.
 BINUTILS_INCDIR := @BINUTILS_INCDIR@
 
-C_INCLUDE_DIRS := @C_INCLUDE_DISR@
+C_INCLUDE_DIRS := @C_INCLUDE_DIRS@
 CXX_INCLUDE_ROOT := @CXX_INCLUDE_ROOT@
 CXX_INCLUDE_ARCH := @CXX_INCLUDE_ARCH@
 CXX_INCLUDE_32BIT_DIR = @CXX_INCLUDE_32BIT_DIR@
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 951969846e5..9ebaadc3bbc 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -672,7 +672,7 @@ case "$withval" in
   *) AC_MSG_ERROR([Invalid path for --with-ocaml-libdir. Provide full path]) ;;
 esac
 
-AC_ARG_WITH(c-include-dir,
+AC_ARG_WITH(c-include-dirs,
   AS_HELP_STRING([--with-c-include-dirs],
     [Colon separated list of directories clang will search for headers]),,
     withval="")
diff --git a/configure b/configure
index 4ef693fa6dd..3e0ca0a680b 100755
--- a/configure
+++ b/configure
@@ -5286,9 +5286,9 @@ echo "$as_me: error: Invalid path for --with-ocaml-libdir. Provide full path" >&
 esac
 
 
-# Check whether --with-c-include-dir was given.
-if test "${with_c_include_dir+set}" = set; then
-  withval=$with_c_include_dir;
+# Check whether --with-c-include-dirs was given.
+if test "${with_c_include_dirs+set}" = set; then
+  withval=$with_c_include_dirs;
 else
   withval=""
 fi