diff --git a/tools/gnulib/Makefile b/tools/gnulib/Makefile
index 1237fad46e..018ff5db14 100644
--- a/tools/gnulib/Makefile
+++ b/tools/gnulib/Makefile
@@ -13,10 +13,15 @@ include $(INCLUDE_DIR)/host-build.mk
 define Host/Configure
 endef
 
+# On installing the .m4 files, we add a gl_ prefix to prevent any conflict with
+# automake. It was found that there is currently a conflict for the cond.m4 that
+# is also shipped by automake, making the gnulib one having priority causing
+# problem with finding AM_CONDITIONAL macro.
 define Host/Install
 	$(call Host/Uninstall)
 	$(INSTALL_DIR) $(1)/share/aclocal
-	$(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/*.m4 $(1)/share/aclocal/
+	$(foreach m4,$(notdir $(wildcard $(HOST_BUILD_DIR)/m4/*.m4)),
+		$(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/$(m4) $(1)/share/aclocal/gl_$(m4))
 	$(CP) $(HOST_BUILD_DIR)/ $(1)/share/gnulib/
 	ln -sf ../share/gnulib/gnulib-tool $(STAGING_DIR_HOST)/bin/gnulib-tool
 endef