diff --git a/Makefile.am b/Makefile.am
index 6a02360..5c2a94d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=libvncserver examples libvncclient webclients client_examples test
 DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test
diff --git a/configure.ac b/configure.ac
index 3f8efbc..ca9f3b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,11 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(LibVNCServer, 0.9.10, https://github.com/LibVNC/libvncserver)
-AM_INIT_AUTOMAKE(LibVNCServer, 0.9.10)
+AM_INIT_AUTOMAKE([subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_CONFIG_HEADER(rfbconfig.h)
 AX_PREFIX_CONFIG_H([rfb/rfbconfig.h])
+AC_CONFIG_MACRO_DIR([m4])
+
 
 # set detailed version info
 AC_DEFINE(VERSION_MAJOR, 0, LibVNCServer major version)
@@ -519,12 +521,12 @@ AC_C_BIGENDIAN
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_TYPE_SOCKLEN_T
+AX_TYPE_SOCKLEN_T
 if test ! -d ./rfb; then
 	echo "creating subdir ./rfb for rfbint.h"
 	mkdir ./rfb 
 fi
-AC_CREATE_STDINT_H(rfb/rfbint.h)
+AX_CREATE_STDINT_H(rfb/rfbint.h)
 AC_CACHE_CHECK([for in_addr_t],
         vnc_cv_inaddrt, [
                 AC_TRY_COMPILE([#include <sys/types.h>