diff --git a/Makefile.am b/Makefile.am
index 8d0d686..f39f8a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = po amtk tests testsuite docs
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
diff --git a/amtk/Makefile.am b/amtk/Makefile.am
index 6f22bd1..d149b65 100644
--- a/amtk/Makefile.am
+++ b/amtk/Makefile.am
@@ -1,4 +1,4 @@
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
 
 AM_CPPFLAGS =				\
 	-DDATADIR=\""$(datadir)"\"	\
diff --git a/configure.ac b/configure.ac
index 2e62e0c..5c567b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,8 @@ AX_PKG_CHECK_MODULES([AMTK_DEP],
 
 # i18n
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
 AC_SUBST([GETTEXT_PACKAGE], [amtk-$AMTK_API_VERSION])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Define to the gettext package name.])
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 6da106f..1d40dfc 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/aminclude_static.am
 
 @VALGRIND_CHECK_RULES@