diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4d349a7c731..edf374ba874 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* Makefile.am (AM_MAKEFLAGS): Pass through mandir.
+	* Makefile.in: Rebuilt.
+
 2007-03-13  Keith Seitz  <keiths@redhat.com>
 
 	* include/java-interp.h (_Jv_InterpClass): Declare
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 59466f017fa..97b38ee347d 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1085,6 +1085,7 @@ AM_MAKEFLAGS = \
 	"exec_prefix=$(exec_prefix)" \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
+	"mandir=$(mandir)" \
 	"prefix=$(prefix)" \
 	"gxx_include_dir=$(gxx_include_dir)" \
 	"AR=$(AR)" \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 287c949d6db..4cabd526840 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -8081,6 +8081,7 @@ AM_MAKEFLAGS = \
 	"exec_prefix=$(exec_prefix)" \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
+	"mandir=$(mandir)" \
 	"prefix=$(prefix)" \
 	"gxx_include_dir=$(gxx_include_dir)" \
 	"AR=$(AR)" \