diff --git a/config.h.in b/config.h.in
index 1b0a2a6a62..a05f6c1cca 100644
--- a/config.h.in
+++ b/config.h.in
@@ -540,7 +540,7 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define to use large-system tuning. */
+/* Define to use default system tuning. */
 #undef TUNE_LARGE
 
 /* define if we can use backtrace */
diff --git a/configure b/configure
index 0a4b3c1ae3..34de22bbe6 100755
--- a/configure
+++ b/configure
@@ -1689,7 +1689,7 @@ Optional Packages:
   --with-libidn2=PATH     enable IDN support using GNU libidn2
                           [yes|no(default)|path]
   --with-cmocka=detect    enable CMocka based tests (default is detect)
-  --with-tuning=ARG       Specify server tuning (large or default)
+  --with-tuning=ARG       Specify server tuning (default or small)
   --with-dlopen=ARG       support dynamically loadable DLZ and DYNDB drivers
   --with-dnsrps-libname   DNSRPS provider library name (librpz.so)
   --with-dnsrps-dir       path to DNSRPS provider library
@@ -22033,27 +22033,22 @@ done
 
 # Check whether --with-tuning was given.
 if test "${with_tuning+set}" = set; then :
-  withval=$with_tuning; use_tuning="$withval"
+  withval=$with_tuning;
 else
-  use_tuning="no"
+  with_tuning=no
 fi
 
 
-case "$use_tuning" in
-	large)
+case $with_tuning in #(
+  small) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: using small system tuning" >&5
+$as_echo "$as_me: using small system tuning" >&6;} ;; #(
+  *) :
 
 $as_echo "#define TUNE_LARGE 1" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using large-system tuning" >&5
-$as_echo "using large-system tuning" >&6; }
-		;;
-	no|default)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using default tuning" >&5
-$as_echo "using default tuning" >&6; }
-		;;
-	yes|*)
-		as_fn_error $? "You must specify \"large\" or \"default\" for --with-tuning." "$LINENO" 5
-		;;
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: using default system tuning" >&5
+$as_echo "$as_me: using default system tuning" >&6;} ;;
 esac
 
 #
diff --git a/configure.ac b/configure.ac
index 1ee7afd88d..eb275ecfe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2236,23 +2236,15 @@ AC_CHECK_FUNCS(setlocale)
 #
 # was --with-tuning specified?
 #
-AC_ARG_WITH(tuning,
+AC_ARG_WITH([tuning],
 	    AS_HELP_STRING([--with-tuning=ARG],
-			   [Specify server tuning (large or default)]),
-	    use_tuning="$withval", use_tuning="no")
+			   [Specify server tuning (default or small)]),
+	    [],[with_tuning=no])
 
-case "$use_tuning" in
-	large)
-		AC_DEFINE(TUNE_LARGE, 1, [Define to use large-system tuning.])
-		AC_MSG_RESULT(using large-system tuning)
-		;;
-	no|default)
-		AC_MSG_RESULT(using default tuning)
-		;;
-	yes|*)
-		AC_MSG_ERROR([You must specify "large" or "default" for --with-tuning.])
-		;;
-esac
+AS_CASE([$with_tuning],
+	[small],[AC_MSG_NOTICE(using small system tuning)],
+	[AC_DEFINE(TUNE_LARGE, 1, [Define to use default system tuning.])
+	 AC_MSG_NOTICE(using default system tuning)])
 
 #
 # was --enable-querytrace specified?