--- libdbusmenu-16.04.0/configure.ac
+++ libdbusmenu-16.04.0/configure.ac
@@ -1,8 +1,8 @@
 
-AC_INIT(libdbusmenu, 16.04.0, ted@canonical.com)
+AC_INIT([libdbusmenu],[16.04.0],[ted@canonical.com])
 AC_COPYRIGHT([Copyright 2009-2016 Canonical])
 
-AC_PREREQ(2.62)
+AC_PREREQ([2.69])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libdbusmenu, 16.04.0, [-Wno-portability])
@@ -10,14 +10,16 @@
 AM_MAINTAINER_MODE
 
 IT_PROG_INTLTOOL([0.35.0])
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_STDC_HEADERS
-AC_PROG_LIBTOOL
+
+LT_INIT
 
 AC_SUBST(VERSION)
 AC_CONFIG_MACRO_DIR([m4])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.22])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -49,7 +51,7 @@
 GTK3_REQUIRED_VERSION=2.91
 
 AC_ARG_ENABLE([gtk],
-	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
+	AS_HELP_STRING([--disable-gtk],[Disable libdbusmenu-gtk library]),
 	[enable_gtk=$enableval], [enable_gtk=auto])
 AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
 
@@ -88,7 +90,7 @@
 X11_REQUIRED_VERSION=1.3
 
 AC_ARG_ENABLE([dumper],
-	AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
+	AS_HELP_STRING([--disable-dumper],[Disable dbusmenudumper tool]),
 	[enable_dumper=$enableval], [enable_dumper=auto])
 AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
 
@@ -110,7 +112,7 @@
 GIO_UNIX_REQUIRED_VERSION=2.24
 
 AC_ARG_ENABLE([tests],
-	AC_HELP_STRING([--disable-tests], [Disable tests]),
+	AS_HELP_STRING([--disable-tests],[Disable tests]),
 	[enable_tests=$enableval], [enable_tests=auto])
 AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
 
@@ -153,7 +155,7 @@
 ###########################
 
 AC_ARG_ENABLE([vala],
-	AC_HELP_STRING([--disable-vala], [Disable vala]),
+	AS_HELP_STRING([--disable-vala],[Disable vala]),
 	[enable_vala=$enableval], [enable_vala=auto])
 
 AS_IF([test "x$enable_vala" != "xno"],[
@@ -218,7 +220,7 @@
 # Files
 ###########################
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 libdbusmenu-glib/Makefile
@@ -238,6 +240,7 @@
 docs/libdbusmenu-gtk/reference/Makefile
 docs/libdbusmenu-gtk/reference/version.xml
 ])
+AC_OUTPUT
 
 ###########################
 # Results