diff --git a/acinclude.m4 b/acinclude.m4
index 96dd14c63445c155447bc9f6ecc293b176d47cdd..35aa4a96c045d0edb78fd2f35b99f58fc48c59d7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -13,7 +13,7 @@ dnl # should be built and installed.
 dnl #
 AC_DEFUN([BM_THUNAR_PLUGIN_APR],
 [
-AC_ARG_ENABLE([apr-plugin], [AC_HELP_STRING([--disable-apr-plugin], [Don't build the thunar-apr plugin, see plugins/thunar-apr/README.md])],
+AC_ARG_ENABLE([apr-plugin], [AS_HELP_STRING([--disable-apr-plugin], [Don't build the thunar-apr plugin, see plugins/thunar-apr/README.md])],
   [ac_bm_thunar_plugin_apr=$enableval], [ac_bm_thunar_plugin_apr=yes])
 AC_MSG_CHECKING([whether to build the thunar-apr plugin])
 AM_CONDITIONAL([THUNAR_PLUGIN_APR], [test x"$ac_bm_thunar_plugin_apr" = x"yes"])
@@ -32,7 +32,7 @@ dnl # should be built and installed.
 dnl #
 AC_DEFUN([BM_THUNAR_PLUGIN_SBR],
 [
-AC_ARG_ENABLE([sbr-plugin], AC_HELP_STRING([--disable-sbr-plugin], [Don't build the thunar-sbr plugin, see plugins/thunar-sbr/README.md]),
+AC_ARG_ENABLE([sbr-plugin], AS_HELP_STRING([--disable-sbr-plugin], [Don't build the thunar-sbr plugin, see plugins/thunar-sbr/README.md]),
   [ac_bm_thunar_plugin_sbr=$enableval], [ac_bm_thunar_plugin_sbr=yes])
 AC_MSG_CHECKING([whether to build the thunar-sbr plugin])
 AM_CONDITIONAL([THUNAR_PLUGIN_SBR], [test x"$ac_bm_thunar_plugin_sbr" = x"yes"])
@@ -52,7 +52,7 @@ dnl # for the Xfce panel, not for Thunar).
 dnl #
 AC_DEFUN([BM_THUNAR_PLUGIN_TPA],
 [
-AC_ARG_ENABLE([tpa-plugin], AC_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README.md]),
+AC_ARG_ENABLE([tpa-plugin], AS_HELP_STRING([--disable-tpa-plugin], [Don't build the thunar-tpa plugin, see plugins/thunar-tpa/README.md]),
   [ac_bm_thunar_plugin_tpa=$enableval], [ac_bm_thunar_plugin_tpa=yes])
 if test x"$ac_bm_thunar_plugin_tpa" = x"yes"; then
   XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0],
@@ -80,7 +80,7 @@ dnl # should be built and installed.
 dnl #
 AC_DEFUN([BM_THUNAR_PLUGIN_UCA],
 [
-AC_ARG_ENABLE([uca-plugin], AC_HELP_STRING([--disable-uca-plugin], [Don't build the thunar-uca plugin, see plugins/thunar-uca/README.md]),
+AC_ARG_ENABLE([uca-plugin], AS_HELP_STRING([--disable-uca-plugin], [Don't build the thunar-uca plugin, see plugins/thunar-uca/README.md]),
   [ac_bm_thunar_plugin_uca=$enableval], [ac_bm_thunar_plugin_uca=yes])
 AC_MSG_CHECKING([whether to build the thunar-uca plugin])
 AM_CONDITIONAL([THUNAR_PLUGIN_UCA], [test x"$ac_bm_thunar_plugin_uca" = x"yes"])
@@ -94,7 +94,7 @@ dnl # should be built and installed.
 dnl #
 AC_DEFUN([BM_THUNAR_PLUGIN_WALLPAPER],
 [
-AC_ARG_ENABLE([wallpaper-plugin], AC_HELP_STRING([--disable-wallpaper-plugin], [Don't build the thunar-wallpaper plugin, see plugins/thunar-wallpaper/README.md]),
+AC_ARG_ENABLE([wallpaper-plugin], AS_HELP_STRING([--disable-wallpaper-plugin], [Don't build the thunar-wallpaper plugin, see plugins/thunar-wallpaper/README.md]),
   [ac_bm_thunar_plugin_wallpaper=$enableval], [ac_bm_thunar_plugin_wallpaper=yes])
 AC_MSG_CHECKING([whether to build the thunar-wallpaper plugin])
 AM_CONDITIONAL([THUNAR_PLUGIN_WALLPAPER], [test x"$ac_bm_thunar_plugin_wallpaper" = x"yes"])
diff --git a/configure.ac.in b/configure.ac.in
index 0ef56739ef89ab5e902570a124cdd514aa9b2af9..417fe2162fed65a59afea660a2ab3f0ef43a1b80 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -58,9 +58,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl *******************************
 dnl *** Check for UNIX variants ***
 dnl *******************************
-AC_AIX()
-AC_ISC_POSIX()
-AC_MINIX()
+AC_USE_SYSTEM_EXTENSIONS
+AC_SEARCH_LIBS([strerror],[cposix])
 
 if test "x$target_os" = "xlinux-gnu"; then
   AC_DEFINE([HAVE_LINUX], [], [Whether we are building on Linux or not])
@@ -70,7 +69,7 @@ dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
 AC_PROG_CC()
-AC_PROG_LD()
+LT_PATH_LD()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
 IT_PROG_INTLTOOL()
@@ -101,7 +100,7 @@ dnl ******************************
 dnl *** Set helper path prefix ***
 dnl ******************************
 AC_ARG_WITH([helper-path-prefix],
-            [AC_HELP_STRING([--with-helper-path-prefix=PATH],
+            [AS_HELP_STRING([--with-helper-path-prefix=PATH],
                             [Path prefix under which helper executables will be installed (default: $libdir)])],
             [HELPER_PATH_PREFIX="$withval"],
             [HELPER_PATH_PREFIX="$libdir"])
@@ -226,7 +225,7 @@ BM_THUNAR_PLUGIN_TPA()
 BM_THUNAR_PLUGIN_UCA()
 BM_THUNAR_PLUGIN_WALLPAPER()
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 docs/Makefile
 docs/design/Makefile
@@ -255,6 +254,7 @@ thunarx/Makefile
 thunarx/thunarx-3.pc
 thunarx/thunarx-config.h
 ])
+AC_OUTPUT
 
 dnl ***************************
 dnl *** Print configuration ***