diff --git a/Changes b/Changes
index 64e1ebe81..2a95c8bff 100644
--- a/Changes
+++ b/Changes
@@ -1457,3 +1457,5 @@ seen. gmtime warning still there
 - Removed src/s_unreal.c contained 2 functions, 1 never used, 1 used once
 - Removed /hash (did nothing), removed /post (replaced by scan_http)
 - Modulized /vhost, /cycle, /svsjoin, /svspart
+- Fixed a autoconf problem where FD_SETSIZE was NOT replaced when it wasn't big enough
+  (abort() problem on some installs.)
diff --git a/autoconf/configure.in b/autoconf/configure.in
index f0aa3a9e3..8ff432308 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -371,7 +371,10 @@ if (FD_SETSIZE >= $ac_fd)
 exit(0);
 exit(1);
 }
-], AC_MSG_RESULT(yes), FD_SETSIZE="-DFD_SETSIZE=$ac_fd" AC_MSG_RESULT(no))
+], AC_MSG_RESULT(yes), [
+FD_SETSIZE="-DFD_SETSIZE=$ac_fd"
+AC_MSG_RESULT(no)
+])
 AC_SUBST(FD_SETSIZE)
 case "${host_cpu}-${host_os}" in
 SunOS*5.*)
diff --git a/configure b/configure
index 9d0edd66c..258bea128 100755
--- a/configure
+++ b/configure
@@ -10552,8 +10552,11 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ( exit $ac_status )
-FD_SETSIZE="-DFD_SETSIZE=$ac_fd" echo "$as_me:$LINENO: result: no" >&5
+
+FD_SETSIZE="-DFD_SETSIZE=$ac_fd"
+echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi