diff --git a/ChangeLog b/ChangeLog
index 8da44a97..040bcb90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -194,6 +194,9 @@ CVS code -
 	  Weinehall)
 	- Don't refer to the built-in file browser as crappy anymore.
 	  (DLR)
+- doc/man/fr/Makefile.am:
+	- Set mandir to @mandir@/fr, so French manpages get installed where
+	  they belong (Jordi).
 - THANKS:
 	- Add new translators to the credits.
 
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index f009b944..e72b5852 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -1,5 +1,7 @@
 man_MANS = nano.1 nanorc.5
 
+mandir = @mandir@/fr
+
 BUILT_SOURCES = nano.1.html nanorc.5.html
 
 nano.1.html: nano.1