diff --git a/Config b/Config
index 282f82769..ff4763837 100755
--- a/Config
+++ b/Config
@@ -66,7 +66,6 @@ ARG="$ARG--with-dpath=$DPATH "
 ARG="$ARG--with-spath=$SPATH "
 ARG="$ARG--with-nick-history=$NICKNAMEHISTORYLENGTH "
 ARG="$ARG--with-sendq=$MAXSENDQLENGTH "
-ARG="$ARG--with-bufferpool=$BUFFERPOOL "
 ARG="$ARG--with-permissions=$DEFPERM "
 ARG="$ARG--with-fd-setsize=$MAXCONNECTIONS "
 ARG="$ARG--enable-dynamic-linking "
@@ -341,7 +340,6 @@ CRYPTOIRCD=""
 SSLDIR=""
 NICKNAMEHISTORYLENGTH="2000"
 MAXSENDQLENGTH="3000000"
-BUFFERPOOL="18"
 MAXCONNECTIONS="1024"
 INET6=""
 REMOTEINC=""
@@ -836,31 +834,6 @@ while [ -z "$TEST" ] ; do
     esac
 done
 
-TEST=""
-while [ -z "$TEST" ] ; do
-    TEST="$BUFFERPOOL"
-    echo ""
-    echo "How many buffer pools would you like?"
-    echo "This number will be multiplied by MAXSENDQLENGTH."
-    echo $n "[$TEST] -> $c"
-	read cc
-    if [ -z "$cc" ] ; then
-	BUFFERPOOL=$TEST
-	break
-    fi
-    case "$cc" in
-	[1-9]*)
-	    BUFFERPOOL="$cc"
-	    ;;
-	*)
-	    echo ""
-	    echo "You must enter a number"
-	    TEST=""
-	    ;;
-    esac
-
-done
-
 echo ""
 TEST=""
 while [ -z "$TEST" ] ; do
@@ -907,7 +880,6 @@ INET6="$INET6"
 PREFIXAQ="$PREFIXAQ"
 LISTEN_SIZE="$LISTEN_SIZE"
 MAXSENDQLENGTH="$MAXSENDQLENGTH"
-BUFFERPOOL="$BUFFERPOOL"
 MAXCONNECTIONS="$MAXCONNECTIONS"
 NICKNAMEHISTORYLENGTH="$NICKNAMEHISTORYLENGTH"
 DEFPERM="$DEFPERM"
diff --git a/configure b/configure
index 209a5eede..34155012a 100755
--- a/configure
+++ b/configure
@@ -627,6 +627,8 @@ LIBOBJS
 URL
 CARES_LIBS
 CARES_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 TRE_LIBS
 TRE_CFLAGS
@@ -702,7 +704,6 @@ enable_option_checking
 with_listen
 with_nick_history
 with_sendq
-with_bufferpool
 with_permissions
 with_dpath
 with_fd_setsize
@@ -732,6 +733,8 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 TRE_CFLAGS
 TRE_LIBS
 CARES_CFLAGS
@@ -1362,7 +1365,6 @@ Optional Packages:
   --with-nick-history=length
                           Specify the length of the nickname history
   --with-sendq=maxsendq   Specify the max sendq for the server
-  --with-bufferpool=size  Specify the size of the buffer pool
   --with-permissions=permissions
                           Specify the default permissions for configuration
                           files
@@ -1395,6 +1397,10 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   TRE_CFLAGS  C compiler flags for TRE, overriding pkg-config
   TRE_LIBS    linker flags for TRE, overriding pkg-config
   CARES_CFLAGS
@@ -5991,20 +5997,6 @@ $as_echo "#define MAXSENDQLENGTH 3000000" >>confdefs.h
 fi
 
 
-# Check whether --with-bufferpool was given.
-if test "${with_bufferpool+set}" = set; then :
-  withval=$with_bufferpool;
-cat >>confdefs.h <<_ACEOF
-#define BUFFERPOOL ($withval * MAXSENDQLENGTH)
-_ACEOF
-
-else
-
-$as_echo "#define BUFFERPOOL (18 * MAXSENDQLENGTH)" >>confdefs.h
-
-fi
-
-
 # Check whether --with-permissions was given.
 if test "${with_permissions+set}" = set; then :
   withval=$with_permissions;
@@ -6228,7 +6220,6 @@ $as_echo "#define USE_SSL /**/" >>confdefs.h
 
 fi
 
-
 # Check whether --enable-dynamic-linking was given.
 if test "${enable_dynamic_linking+set}" = set; then :
   enableval=$enable_dynamic_linking; enable_dynamic_linking=$enableval
@@ -6560,6 +6551,11 @@ export PATH_SEPARATOR
 
 
 
+
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -6672,7 +6668,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 if test "x$with_system_tre" = "xno"; then :
 
@@ -6720,46 +6715,46 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRE" >&5
 $as_echo_n "checking for TRE... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$TRE_CFLAGS"; then
-        pkg_cv_TRE_CFLAGS="$TRE_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$TRE_CFLAGS"; then
+    pkg_cv_TRE_CFLAGS="$TRE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tre >= 0.7.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "tre >= 0.7.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_TRE_CFLAGS=`$PKG_CONFIG --cflags "tre >= 0.7.5" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$TRE_LIBS"; then
-        pkg_cv_TRE_LIBS="$TRE_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$TRE_LIBS"; then
+    pkg_cv_TRE_LIBS="$TRE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tre >= 0.7.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "tre >= 0.7.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_TRE_LIBS=`$PKG_CONFIG --libs "tre >= 0.7.5" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -6767,9 +6762,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tre >= 0.7.5"`
+	        TRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tre >= 0.7.5" 2>&1`
         else
-	        TRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tre >= 0.7.5"`
+	        TRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tre >= 0.7.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TRE_PKG_ERRORS" >&5
@@ -6783,9 +6778,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables TRE_CFLAGS
 and TRE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
@@ -6796,14 +6792,14 @@ Alternatively, you may set the environment variables TRE_CFLAGS
 and TRE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
 	TRE_CFLAGS=$pkg_cv_TRE_CFLAGS
 	TRE_LIBS=$pkg_cv_TRE_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 fi
@@ -6872,46 +6868,46 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5
 $as_echo_n "checking for CARES... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CARES_CFLAGS"; then
-        pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$CARES_CFLAGS"; then
+    pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CARES_LIBS"; then
-        pkg_cv_CARES_LIBS="$CARES_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$CARES_LIBS"; then
+    pkg_cv_CARES_LIBS="$CARES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -6919,9 +6915,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcares >= 1.6.0"`
+	        CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
         else
-	        CARES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcares >= 1.6.0"`
+	        CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CARES_PKG_ERRORS" >&5
@@ -6935,9 +6931,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables CARES_CFLAGS
 and CARES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
@@ -6948,14 +6945,14 @@ Alternatively, you may set the environment variables CARES_CFLAGS
 and CARES_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
 	CARES_CFLAGS=$pkg_cv_CARES_CFLAGS
 	CARES_LIBS=$pkg_cv_CARES_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 fi
diff --git a/configure.ac b/configure.ac
index f38aa9090..e8703af4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,9 +460,6 @@ AC_ARG_WITH(nick-history, [AS_HELP_STRING([--with-nick-history=length],[Specify
 AC_ARG_WITH([sendq], [AS_HELP_STRING([--with-sendq=maxsendq],[Specify the max sendq for the server])],
 	[AC_DEFINE_UNQUOTED([MAXSENDQLENGTH], [$withval], [Set to the max sendq you want])],
 	[AC_DEFINE([MAXSENDQLENGTH], [3000000], [Set to the max sendq you want])])
-AC_ARG_WITH(bufferpool, [AS_HELP_STRING([--with-bufferpool=size],[Specify the size of the buffer pool])],
-	[AC_DEFINE_UNQUOTED([BUFFERPOOL],[($withval * MAXSENDQLENGTH)], [Set to the bufferpool size you want])],
-	[AC_DEFINE([BUFFERPOOL],[(18 * MAXSENDQLENGTH)], [Set to the bufferpool size you want])])
 AC_ARG_WITH(permissions, [AS_HELP_STRING([--with-permissions=permissions], [Specify the default permissions for
 configuration files])],
 	dnl We have an apparently out-of-place 0 here because of a MacOSX bug and because
diff --git a/include/setup.h.in b/include/setup.h.in
index 5b927191a..b8da02244 100644
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -3,9 +3,6 @@
 /* Define if you have BSD signals */
 #undef BSD_RELIABLE_SIGNALS
 
-/* Set to the bufferpool size you want */
-#undef BUFFERPOOL
-
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */