diff --git a/ChangeLog b/ChangeLog
index 2cdd2e83..d1f24d42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ Changes in 1.4.10-stable:
  o clean up buffered http connection data on reset; reported by Brian O'Kelley
  o bug fix and potential race condition in signal handling; from Alexander Drozdov
  o rename the Solaris event ports backend to evport
+ o support compilation on Haiku
 
 Changes in 1.4.9-stable:
  o event_add would not return error for some backends; from Dean McNamee
diff --git a/Makefile.am b/Makefile.am
index 7d0d155c..f13c7337 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
+ACLOCAL_AMFLAGS = -I m4
 
 # This is the point release for libevent.  It shouldn't include any
 # a/b/c/d/e notations.
diff --git a/configure.in b/configure.in
index 7d8dbf59..bba08fb3 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,8 @@ dnl configure.in for libevent
 dnl Dug Song <dugsong@monkey.org>
 AC_INIT(event.c)
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE(libevent,1.4.9-stable)
 AM_CONFIG_HEADER(config.h)
 dnl AM_MAINTAINER_MODE
diff --git a/test/bench.c b/test/bench.c
index 48fd32a9..e51b12a9 100644
--- a/test/bench.c
+++ b/test/bench.c
@@ -44,7 +44,7 @@
 #include <windows.h>
 #else
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/resource.h>
 #endif
 #include <fcntl.h>
diff --git a/test/regress.c b/test/regress.c
index b5fab7e6..950cd478 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -43,7 +43,7 @@
 #ifndef WIN32
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif
diff --git a/test/regress_dns.c b/test/regress_dns.c
index 8191192c..129cdad4 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
@@ -89,7 +89,7 @@ dns_gethostbyname_cb(int result, char type, int count, int ttl,
 
 	switch (type) {
 	case DNS_IPv6_AAAA: {
-#if defined(HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP)
+#if defined(HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
 		struct in6_addr *in6_addrs = addresses;
 		char buf[INET6_ADDRSTRLEN+1];
 		int i;
@@ -258,7 +258,7 @@ dns_server_gethostbyname_cb(int result, char type, int count, int ttl,
 		break;
 	}
 	case DNS_IPv6_AAAA: {
-#if defined (HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP)
+#if defined (HAVE_STRUCT_IN6_ADDR) && defined(HAVE_INET_NTOP) && defined(INET6_ADDRSTRLEN)
 		struct in6_addr *in6_addrs = addresses;
 		char buf[INET6_ADDRSTRLEN+1];
 		if (memcmp(&in6_addrs[0].s6_addr, "abcdefghijklmnop", 16)
diff --git a/test/regress_http.c b/test/regress_http.c
index 11189c54..9091f89a 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index c80fb9d9..76093476 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -42,7 +42,7 @@
 #include <sys/queue.h>
 #ifndef WIN32
 #include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 #include <netdb.h>
 #endif