diff --git a/Makefile.am b/Makefile.am
index 0266a53ff571ec0f522fce157e84cfe65bbdc76c..ac57ea2af97b055bc144c7e89c8e22fae36d3dc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,13 @@ mboxctl_SOURCES = mboxctl.c
 mboxctl_LDFLAGS = $(LIBSYSTEMD_LIBS)
 mboxctl_CFLAGS = $(LIBSYSTEMD_CFLAGS)
 
+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
 
 check_PROGRAMS =
 XFAIL_TESTS =
diff --git a/configure.ac b/configure.ac
index b505e4d6b0b5266cad16d90894f1163199cc78a4..af137327add108eebe975f82d66fdf33289d7ec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 AC_PREREQ([2.69])
 AC_INIT([mboxd], [2.1.1], [https://github.com/openbmc/mboxbridge/issues])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([subdir-objects -Wall foreign dist-xz])
+AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-portability foreign dist-xz])
 AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIRS([m4])
 
@@ -65,6 +65,10 @@ AS_IF([test "x$enable_virtual_pnor" == "xyes"],
 )
 
 AX_CODE_COVERAGE
+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([])
 
 PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd, , AC_MSG_ERROR([libsytemd not found]))
 AC_SUBST([LIBSYSTEMD_CFLAGS])