diff --git a/acinclude.m4 b/acinclude.m4
index f466affa9a..1ce50141f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -317,7 +317,6 @@ dnl AC_MINIX
 dnl Various compiler setup.
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 COMPILER_HAS_FUNCTION_MACRO
 
 dnl Checks for programs.
@@ -1556,6 +1555,7 @@ else
     AC_MSG_RESULT(no)
 fi
 
+AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
 AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_TYPES(sig_t, , ,
diff --git a/src/cf/socklen.m4 b/src/cf/socklen.m4
new file mode 100644
index 0000000000..50ee10f1df
--- /dev/null
+++ b/src/cf/socklen.m4
@@ -0,0 +1,18 @@
+AC_DEFUN([AC_TYPE_SOCKLEN_T],
+[
+AC_CACHE_CHECK([for socklen_t], 
+ac_cv_type_socklen_t, [
+        AC_TRY_COMPILE([
+                      #include <sys/types.h>
+                      #include <sys/socket.h>
+              ],
+              [
+                      socklen_t len = 42; return 0;
+              ],
+              ac_cv_type_socklen_t="yes", ac_cv_type_socklen_t="no")
+        ])
+
+        if test "x$ac_cv_type_socklen_t" = "xno"; then
+              AC_DEFINE(socklen_t, int, [the type of the last argument to getsockopt etc])
+        fi
+])