diff --git a/Config b/Config
index 1eca0391f..274b11c3a 100755
--- a/Config
+++ b/Config
@@ -66,9 +66,6 @@ fi
 if [ "$REMOTEINC" = "1" ] ; then
 ARG="$ARG--enable-libcurl=$CURLDIR "
 fi
-if [ "$INET6" = "1" ] ; then
-ARG="$ARG--enable-inet6 "
-fi
 if [ "$PREFIXAQ" != "1" ]; then
 ARG="$ARG--disable-prefixaq "
 fi
@@ -357,7 +354,6 @@ SSLDIR=""
 NICKNAMEHISTORYLENGTH="2000"
 MAXSENDQLENGTH="3000000"
 MAXCONNECTIONS="1024"
-INET6=""
 REMOTEINC=""
 CURLDIR=""
 PREFIXAQ="1"
@@ -557,35 +553,6 @@ else
     SSLDIR=`eval echo $cc` # modified
 fi
 
-TEST=""
-while [ -z "$TEST" ] ; do
-    if [ "$INET6" = "1" ] ; then
-	TEST="Yes"
-    else
-	TEST="No"
-    fi
-    echo ""
-    echo "Do you want to enable IPv6 support?"
-    echo $n "[$TEST] -> $c"
-	read cc
-    if [ -z "$cc" ] ; then
-	cc=$TEST
-    fi
-    case "$cc" in
-	[Yy]*)
-	    INET6="1"
-	    ;;
-	[Nn]*)
-	    INET6=""
-	    ;;
-	*)
-	    echo ""
-	    echo "You must enter either Yes or No"
-	    TEST=""
-	    ;;
-    esac
-done
-
 TEST=""
 while [ -z "$TEST" ] ; do
     if [ "$REMOTEINC" = "1" ] ; then
@@ -888,7 +855,6 @@ LOGDIR="$LOGDIR"
 CACHEDIR="$CACHEDIR"
 DOCDIR="$DOCDIR"
 TMPDIR="$TMPDIR"
-INET6="$INET6"
 PREFIXAQ="$PREFIXAQ"
 MAXSENDQLENGTH="$MAXSENDQLENGTH"
 MAXCONNECTIONS="$MAXCONNECTIONS"
diff --git a/configure b/configure
index 94d49b495..787294f4b 100755
--- a/configure
+++ b/configure
@@ -752,7 +752,6 @@ with_system_pcre2
 with_system_cares
 enable_ssl
 enable_dynamic_linking
-enable_inet6
 enable_libcurl
 '
       ac_precious_vars='build_alias
@@ -1393,7 +1392,6 @@ Optional Features:
                           Make the IRCd statically link with shared objects
                           rather than dynamically (noone knows if disabling
                           dynamic linking actually does anything or not)
-  --enable-inet6          Make the IRCd support IPv6
   --enable-libcurl=DIR    enable libcurl (remote include) support
 
 Optional Packages:
@@ -1625,6 +1623,48 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1753,48 +1793,6 @@ fi
 
 } # ac_fn_c_check_header_mongrel
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -3968,6 +3966,49 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system has IPv6 support" >&5
+$as_echo_n "checking if your system has IPv6 support... " >&6; }
+if ${ac_cv_ip6+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+save_libs="$LIBS"
+LIBS="$LIBS $SOCKLIB"
+if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+int main() {
+if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+exit(1);
+exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_ip6=yes
+else
+  ac_cv_ip6=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip6" >&5
+$as_echo "$ac_cv_ip6" >&6; }
+if test "$ac_cv_ip6" = "no"; then
+	as_fn_error $? "Your system does not support IPv6" "$LINENO" 5
+fi
+LIBS="$save_libs"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6609,92 +6650,6 @@ $as_echo "#define STATIC_LINKING /**/" >>confdefs.h
 
 fi
 
-# Check whether --enable-inet6 was given.
-if test "${enable_inet6+set}" = set; then :
-  enableval=$enable_inet6; if test $enableval = "yes"; then :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system has IPv6 support" >&5
-$as_echo_n "checking if your system has IPv6 support... " >&6; }
-if ${ac_cv_ip6+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-		save_libs="$LIBS"
-		LIBS="$LIBS $SOCKLIB"
-		if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-int main() {
-if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-exit(1);
-exit(0);
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_ip6=yes
-else
-  ac_cv_ip6=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip6" >&5
-$as_echo "$ac_cv_ip6" >&6; }
-	if test "$ac_cv_ip6" = "no"; then
-		as_fn_error $? "Your system does not support IPv6 so it will not be enabled" "$LINENO" 5
-	else
-
-$as_echo "#define INET6 /**/" >>confdefs.h
-
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct in6addr_any" >&5
-$as_echo_n "checking for struct in6addr_any... " >&6; }
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define IN_AUTOCONF
-				#include <sys/types.h>
-				#include <sys/socket.h>
-				#include <netinet/in.h>
-int
-main ()
-{
-struct in6_addr a = in6addr_any;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_IN6ADDR_ANY 1" >>confdefs.h
-
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	fi
-	LIBS="$save_libs"
-
-fi
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if FD_SETSIZE is large enough to allow $ac_fd file descriptors" >&5
 $as_echo_n "checking if FD_SETSIZE is large enough to allow $ac_fd file descriptors... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 9e8b5d14e..708598b4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,11 +158,11 @@ dnl defined in the Makefiles using -D. Having it defined globally will
 dnl only cause braindamage and symbol collisions :-D.
 dnl AC_DEFINE([DYNAMIC_LINKING], [], [Link dynamically as opposed to statically. (Dynamic linking is the only supported method of linking atm)])
 ])
-AC_DEFUN([AC_ENABLE_INET6],[
-	AC_CACHE_CHECK([if your system has IPv6 support], [ac_cv_ip6], [
-		save_libs="$LIBS"
-		LIBS="$LIBS $SOCKLIB"
-		AC_TRY_RUN([
+
+AC_CACHE_CHECK([if your system has IPv6 support], [ac_cv_ip6], [
+save_libs="$LIBS"
+LIBS="$LIBS $SOCKLIB"
+AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/socket.h>
 int main() {
@@ -170,33 +170,14 @@ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
 exit(1);
 exit(0);
 }
-			],
-			[ac_cv_ip6=yes],
-			[ac_cv_ip6=no])
-		])
-	if test "$ac_cv_ip6" = "no"; then
-		AC_MSG_ERROR([Your system does not support IPv6 so it will not be enabled])
-	else
-		AC_DEFINE([INET6], [], [Define if you want IPv6 enabled])
-		dnl in6addr_any detection code taken from ratbox
-		AC_MSG_CHECKING([for struct in6addr_any])
-		AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM(
-				[[#define IN_AUTOCONF
-				#include <sys/types.h>
-				#include <sys/socket.h>
-				#include <netinet/in.h>]],
-				[[struct in6_addr a = in6addr_any;]]
-			)],
-			[AC_MSG_RESULT(yes)],
-				[
-				AC_MSG_RESULT([no])
-				AC_DEFINE([NO_IN6ADDR_ANY], [1], [Define to 1 if your system has no in6addr_any.])
-				]
-			)
-	fi
-	LIBS="$save_libs"
+],
+	[ac_cv_ip6=yes],
+	[ac_cv_ip6=no])
 ])
+if test "$ac_cv_ip6" = "no"; then
+	AC_MSG_ERROR([Your system does not support IPv6])
+fi
+LIBS="$save_libs"
 
 AC_CHECK_HEADER(sys/param.h,
 	AC_DEFINE([PARAMH], [], [Define if you have the <sys/param.h> header file.]))
@@ -581,9 +562,6 @@ AS_IF([test $enable_dynamic_linking = "yes"],
 	[AC_ENABLE_DYN],
 	[AC_DEFINE([STATIC_LINKING], [], [Link... statically(?) (defining this macro will probably cause the build tofail)])])
 
-AC_ARG_ENABLE([inet6], [AS_HELP_STRING([--enable-inet6], [Make the IRCd support IPv6])],
-	[AS_IF([test $enableval = "yes"],
-		[AC_ENABLE_INET6])])
 AC_MSG_CHECKING([if FD_SETSIZE is large enough to allow $ac_fd file descriptors])
 AC_COMPILE_IFELSE([
 #include <sys/types.h>
diff --git a/include/setup.h.in b/include/setup.h.in
index adc2db3bf..b7e2bbcba 100644
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -208,9 +208,6 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
 
-/* Define if you want IPv6 enabled */
-#undef INET6
-
 /* Define if you want modes shown in /list */
 #undef LIST_SHOW_MODES
 
@@ -274,9 +271,6 @@
 /* Define if you do not have the index function. */
 #undef NOINDEX
 
-/* Define to 1 if your system has no in6addr_any. */
-#undef NO_IN6ADDR_ANY
-
 /* Define if you want OperOverride disabled */
 #undef NO_OPEROVERRIDE
 
diff --git a/include/win32/setup.h b/include/win32/setup.h
index 095e2a9a1..173b57b74 100644
--- a/include/win32/setup.h
+++ b/include/win32/setup.h
@@ -55,7 +55,6 @@
 #define NEED_U_INT32_T
 #define PREFIX_AQ
 #define LIST_SHOW_MODES
-#define INET6
 #ifndef mode_t
 /*
   Needed in s_conf.c for the third argument of open(3p).