diff --git a/configure b/configure
index c919563be2..251bd27916 100755
--- a/configure
+++ b/configure
@@ -954,7 +954,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_libbind
-enable_error
+enable_warn_error
 enable_developer
 with_python
 enable_newstats
@@ -11383,9 +11383,9 @@ It is available from http://www.isc.org as a separate download." "$LINENO" 5
 		;;
 esac
 
-# Check whether --enable-error was given.
-if test "${enable_error+set}" = set; then :
-  enableval=$enable_error;
+# Check whether --enable-warn_error was given.
+if test "${enable_warn_error+set}" = set; then :
+  enableval=$enable_warn_error;
 fi
 
 
diff --git a/configure.in b/configure.in
index 4491ee902b..a741165ba8 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ It is available from http://www.isc.org as a separate download.])
 		;;
 esac
 
-AC_ARG_ENABLE(error, [  --enable-warn-error	  turn on -Werror when compiling])
+AC_ARG_ENABLE(warn_error, [  --enable-warn-error	  turn on -Werror when compiling])
 
 AC_ARG_ENABLE(developer, [  --enable-developer      enable developer build settings])
 case "$enable_developer" in