diff --git a/Makefile.am b/Makefile.am
index dcf11f60..8420bcc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.10
 ACLOCAL_AMFLAGS = -I aclocal
 
 MAINTAINERCLEANFILES = \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bd3778a9..e8886134 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,7 @@ if ENABLE_MAN
 html.out/*:	api/xsl-stylesheets
 	test -n "$(XSLTPROC)"
 	-rm -fr html.tmp
-	$(mkdir_p) html.tmp
+	$(MKDIR_P) html.tmp
 	$(XSLTPROC) --nonet --xinclude -o "html.out/api.html" "$(srcdir)/api/html.xsl" "$(srcdir)/api/api.xml"
 	$(XSLTPROC) --nonet --xinclude -o "html.out/tools.html" "$(srcdir)/api/html.xsl" "$(srcdir)/tools/tools.xml"
 	mv html.tmp html.out
@@ -36,7 +36,7 @@ html.out/*:	api/xsl-stylesheets
 man.out/*.1:	api/xsl-stylesheets
 	test -n "$(XSLTPROC)"
 	-rm -fr man.tmp
-	$(mkdir_p) man.tmp
+	$(MKDIR_P) man.tmp
 	$(XSLTPROC) --nonet --xinclude -o "man.out/" "$(srcdir)/api/man.xsl" "$(srcdir)/api/api.xml"
 	$(XSLTPROC) --nonet --xinclude -o "man.out/" "$(srcdir)/api/man.xsl" "$(srcdir)/tools/tools.xml"
 	mv man.tmp man.out