diff --git a/ChangeLog b/ChangeLog
index 454e7e2..d593c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-10  Mark Hatle <mark.hatle@windriver.com>
+	* configure.ac, m4/libelf.m4, doc/Makefile.am, gelf/Makefile.am,
+	  gelfx/Makefile.am, gelfx32/Makefile.am, patches/Makefile.am,
+	  src/Makefile.am, src/rtld/Makefile.am, testsuite/Makefile.am:
+		Update to avoid autoconf/automake warnings
+
 2015-10-29  Mark Hatle <mark.hatle@windriver.com>
 	    Kyle McMartin  <kmcmartin@redhat.com>
 	    Jakub Jelinek  <jakub@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 5a50830..b78e89d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
 MAINT_CHARSET = latin1
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 4943932..507fa89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-AC_INIT(src/prelink.c)
+AC_INIT([prelink], [1.0])
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.50)			dnl Minimum Autoconf version required.
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([prelink], [0.0])
+AM_INIT_AUTOMAKE([subdir-objects gnu 1.4])
 
 ALL_LINGUAS=
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 45f4757..95f5636 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 man_MANS = prelink.8 execstack.8
 EXTRA_DIST = prelink.8 execstack.8 prelink.conf
 PDFLATEXINPUTS = TEXINPUTS_pdflatex=.:$(srcdir):`kpsewhich --progname=pdflatex --show-path=cnf.pdflatex`
diff --git a/gelf/Makefile.am b/gelf/Makefile.am
index f6320fa..ec30b76 100644
--- a/gelf/Makefile.am
+++ b/gelf/Makefile.am
@@ -1,10 +1,8 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall
 AM_CFLAGS = -Wall
-INCLUDES = @GELFINCLUDE@
+AM_CPPFLAGS = @GELFINCLUDE@
 
 noinst_LTLIBRARIES = libgelf.la
 
diff --git a/gelfx/Makefile.am b/gelfx/Makefile.am
index ae51b93..9ea1a44 100644
--- a/gelfx/Makefile.am
+++ b/gelfx/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 noinst_HEADERS = gelfx.h
diff --git a/gelfx32/Makefile.am b/gelfx32/Makefile.am
index ae51b93..9ea1a44 100644
--- a/gelfx32/Makefile.am
+++ b/gelfx32/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 noinst_HEADERS = gelfx.h
diff --git a/m4/libelf.m4 b/m4/libelf.m4
index 88f061b..295bf0c 100644
--- a/m4/libelf.m4
+++ b/m4/libelf.m4
@@ -5,7 +5,7 @@ dnl Detect it.
 
 dnl Written by Jakub Jelinek <jakub@redhat.com>.
 
-AC_DEFUN(AC_LIBELF_SXWORD,
+AC_DEFUN([AC_LIBELF_SXWORD],
   [AC_TRY_RUN([
 #include <errno.h>
 #include <fcntl.h>
diff --git a/patches/Makefile.am b/patches/Makefile.am
index efe5d40..18bf051 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 EXTRA_DIST = libelf-0.7.0.patch libelf-0.7.0-hash.patch linux-2.4.10.patch
diff --git a/src/Makefile.am b/src/Makefile.am
index 7372fc1..93333a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 SUBDIRS = rtld
 
 PKGVERSION = "\"@PKGVERSION@\""
@@ -17,7 +15,7 @@ AM_CPPFLAGS = -DSBINDIR='"@sbindir@"' -DBINDIR='"@bindir@"' \
 	    -DEXEEXT='"$(EXEEXT)"' \
 	    -DPKGVERSION=$(PKGVERSION) \
 	    -DREPORT_BUGS_TO=$(REPORT_BUGS_TO)
-INCLUDES = @GELFINCLUDE@
+AM_CPPFLAGS += @GELFINCLUDE@
 
 sbin_PROGRAMS = prelink
 bin_PROGRAMS = execstack
diff --git a/src/rtld/Makefile.am b/src/rtld/Makefile.am
index b02c745..dea4195 100644
--- a/src/rtld/Makefile.am
+++ b/src/rtld/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 PKGVERSION = "\"@PKGVERSION@\""
 REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
 
@@ -15,13 +13,13 @@ AM_CPPFLAGS = -DSBINDIR='"@sbindir@"' -DBINDIR='"@bindir@"' \
 	    -DEXEEXT='"$(EXEEXT)"' \
 	    -DPKGVERSION=$(PKGVERSION) \
 	    -DREPORT_BUGS_TO=$(REPORT_BUGS_TO)
-INCLUDES = -I$(top_srcdir)/src @GELFINCLUDE@
+AM_CPPFLAGS += -I$(top_srcdir)/src @GELFINCLUDE@
 
 sbin_PROGRAMS = prelink-rtld
 
-prelink_rtld_SOURCES = $(top_srcdir)/src/data.c $(top_srcdir)/src/dso.c \
-		       $(top_srcdir)/src/canonicalize.c $(top_srcdir)/src/wrap-file.c \
-		       $(top_srcdir)/src/reloc-info.c $(top_srcdir)/src/reloc-info.h \
+prelink_rtld_SOURCES = ../data.c ../dso.c \
+		       ../canonicalize.c ../wrap-file.c \
+		       ../reloc-info.c ../src/reloc-info.h \
 		       rtld.c ld-libs.h \
 		       dl-hash.h dl-object.c dl-load.c \
 		       dl-tls.c dl-version.c dl-misc.c \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 65d035d..9c9aba7 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall
 AM_CFLAGS = -Wall