diff --git a/configure.ac b/configure.ac
index 5ba26e7ae..e01c96c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ define([SOFTHSM_VERSION_REVISION], [5])
 # Init
 AC_PREREQ(2.61)
 AC_INIT([SoftHSM],[SOFTHSM_VERSION_MAJOR.SOFTHSM_VERSION_MINOR.SOFTHSM_VERSION_FIX[]PACKAGE_SUFFIX])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
@@ -67,7 +67,7 @@ ACX_NON_PAGED_MEMORY
 # If the user want to have the migration tool
 # Requires SQLite3
 AC_ARG_WITH(migrate,
-	AC_HELP_STRING([--with-migrate],
+	AS_HELP_STRING([--with-migrate],
 		[Build the migration tool. Requires SQLite3.]
 	),
 	[build_migrate="${withval}"],
@@ -84,7 +84,7 @@ AM_CONDITIONAL([BUILD_MIGRATE], [test "x${build_migrate}" = "xyes"])
 
 # If the user wants to have the database storage backend
 AC_ARG_WITH([objectstore-backend-db],
-	AC_HELP_STRING([--with-objectstore-backend-db],
+	AS_HELP_STRING([--with-objectstore-backend-db],
 		[Build with object store backend database (SQLite3).]
 	),
 	[build_objectstore_backend_db="${withval}"],
@@ -194,7 +194,7 @@ AC_SUBST([default_softhsm2_lib])
 
 # Generate the libtool script and install script
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+LT_INIT
 
 # Generate the makefiles
 AC_CONFIG_FILES([
diff --git a/m4/acx_botan.m4 b/m4/acx_botan.m4
index d863e42a2..e66f859d8 100644
--- a/m4/acx_botan.m4
+++ b/m4/acx_botan.m4
@@ -1,7 +1,7 @@
 AC_DEFUN([ACX_BOTAN],[
 	WITH_BOTAN=
 	AC_ARG_WITH(botan,
-        	AC_HELP_STRING([--with-botan=PATH],[Specify prefix of path of Botan]),
+		AS_HELP_STRING([--with-botan=PATH],[Specify prefix of path of Botan]),
 		[
 			BOTAN_PATH="$withval"
 			WITH_BOTAN=1
diff --git a/m4/acx_crypto_backend.m4 b/m4/acx_crypto_backend.m4
index b036b7f7c..0af546173 100644
--- a/m4/acx_crypto_backend.m4
+++ b/m4/acx_crypto_backend.m4
@@ -3,7 +3,7 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 	# First check if we want to support ECC and GOST
 
 	AC_ARG_ENABLE(ecc,
-		AC_HELP_STRING([--enable-ecc],
+		AS_HELP_STRING([--enable-ecc],
 			[Enable support for ECC (default detect)]
 		),
 		[enable_ecc="${enableval}"],
@@ -11,7 +11,7 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 	)
 
 	AC_ARG_ENABLE(gost,
-		AC_HELP_STRING([--enable-gost],
+		AS_HELP_STRING([--enable-gost],
 			[Enable support for GOST (default detect)]
 		),
 		[enable_gost="${enableval}"],
@@ -21,7 +21,7 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 	# Add Eddsa check
 
 	AC_ARG_ENABLE(eddsa,
-		AC_HELP_STRING([--enable-eddsa],
+		AS_HELP_STRING([--enable-eddsa],
 			[Enable support for EDDSA (default detect)]
 		),
 		[enable_eddsa="${enableval}"],
@@ -31,7 +31,7 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 	# Second check for the FIPS 140-2 mode
 
 	AC_ARG_ENABLE(fips,
-		AC_HELP_STRING([--enable-fips],
+		AS_HELP_STRING([--enable-fips],
 			[Enable support for FIPS 140-2 mode (default disabled)]
 		),
 		[enable_fips="${enableval}"],
@@ -52,7 +52,7 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 	# Then check what crypto library we want to use
 
 	AC_ARG_WITH(crypto-backend,
-		AC_HELP_STRING([--with-crypto-backend],
+		AS_HELP_STRING([--with-crypto-backend],
 			[Select crypto backend (openssl|botan)]
 		),
 		[crypto_backend="${withval}"],
diff --git a/m4/acx_non_paged_memory.m4 b/m4/acx_non_paged_memory.m4
index 0253e9879..2e2a59dbd 100644
--- a/m4/acx_non_paged_memory.m4
+++ b/m4/acx_non_paged_memory.m4
@@ -1,7 +1,7 @@
 AC_DEFUN([ACX_NON_PAGED_MEMORY],[
 
 	AC_ARG_ENABLE(non-paged-memory,
-		AC_HELP_STRING([--disable-non-paged-memory],
+		AS_HELP_STRING([--disable-non-paged-memory],
 			[Disable non-paged memory for secure storage (default enabled)]
 		),
 		[enable_non_paged_memory="${enableval}"],
diff --git a/m4/acx_openssl.m4 b/m4/acx_openssl.m4
index 2f1adad07..99499674d 100644
--- a/m4/acx_openssl.m4
+++ b/m4/acx_openssl.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([ACX_OPENSSL],[
 	AC_ARG_WITH(openssl,
-        	AC_HELP_STRING([--with-openssl=PATH],[Specify prefix of path of OpenSSL]),
+		AS_HELP_STRING([--with-openssl=PATH],[Specify prefix of path of OpenSSL]),
 		[
 			OPENSSL_INCLUDES="-I$withval/include"
 			OPENSSL_LIBDIRS="-L$withval/lib"
diff --git a/m4/acx_p11kit.m4 b/m4/acx_p11kit.m4
index 9545e7e7a..f0df650a9 100644
--- a/m4/acx_p11kit.m4
+++ b/m4/acx_p11kit.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([ACX_P11KIT],[
 	AC_ARG_ENABLE([p11-kit],
-		AC_HELP_STRING([--enable-p11-kit],
+		AS_HELP_STRING([--enable-p11-kit],
 			[Enable p11-kit integration (default enabled)]
 		),
 		[enable_p11kit="${enableval}"],
@@ -8,7 +8,7 @@ AC_DEFUN([ACX_P11KIT],[
 	)
 
 	AC_ARG_WITH(p11-kit,
-		AC_HELP_STRING([--with-p11-kit=PATH],[Specify install path of the p11-kit module, will override path given by pkg-config]),
+		AS_HELP_STRING([--with-p11-kit=PATH],[Specify install path of the p11-kit module, will override path given by pkg-config]),
 		[P11KIT_PATH="$withval"],
 		[P11KIT_PATH=""]
 	)
diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4
index 17c126d16..ce63029de 100644
--- a/m4/acx_sqlite3.m4
+++ b/m4/acx_sqlite3.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([ACX_SQLITE3],[
 	AC_ARG_WITH(sqlite3,
-        	AC_HELP_STRING([--with-sqlite3=PATH],[Specify prefix of path of SQLite3]),
+		AS_HELP_STRING([--with-sqlite3=PATH],[Specify prefix of path of SQLite3]),
 		[
 			SQLITE3_INCLUDES="-I$withval/include"
 			SQLITE3_LIBDIRS="-L$withval/lib"