diff --git a/.gitignore b/.gitignore
index a2b962a..a11e810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 ar-lib
 arm-openbmc-linux-gnueabi-libtool
 autom4te.cache/
+/aminclude_static.am
 compile
 config.guess
 config.h
diff --git a/Makefile.am b/Makefile.am
index 467db44..9583fac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,14 @@
 CODE_COVERAGE_GENHTML_OPTIONS += --prefix $(abs_srcdir) --prefix $(abs_builddir)
 export CODE_COVERAGE_GENHTML_OPTIONS
 
+if AUTOCONF_CODE_COVERAGE_2019_01_06
+include $(top_srcdir)/aminclude_static.am
+clean-local: code-coverage-clean
+distclean-local: code-coverage-dist-clean
+else
+@CODE_COVERAGE_RULES@
+endif
+
 AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
diff --git a/configure.ac b/configure.ac
index d766ba8..df031b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_INIT([swampd], [0.1], [https://github.com/openbmc/phosphor-pid-control/issues])
 AC_LANG([C++])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
+AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-portability -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])
 
 # Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS
@@ -132,10 +132,13 @@
 
 # Code coverage
 AX_CODE_COVERAGE
-AM_EXTRA_RECURSIVE_TARGETS([check-code-coverage])
 AS_IF([test "x$CODE_COVERAGE_ENABLED" = "xyes"], [
     AX_APPEND_COMPILE_FLAGS([-DHAVE_GCOV], [CODE_COVERAGE_CPPFLAGS])
 ])
+m4_ifdef([_AX_CODE_COVERAGE_RULES],
+    [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])],
+    [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])])
+AX_ADD_AM_MACRO_STATIC([])
 
 AC_ARG_ENABLE([oe-sdk],
     AS_HELP_STRING(
diff --git a/test/Makefile.am b/test/Makefile.am
index 3dfae00..fbc78bf 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,3 @@
-@CODE_COVERAGE_RULES@
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/ \
 	$(GTEST_CFLAGS) \