diff --git a/ChangeLog b/ChangeLog
index 368962e4..4963b93b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ CVS code -
 	- Update section 4.1 to describe how to open files with names
 	  beginning with '+' at specified columns as well as lines.
 	  (DLR)
+- doc/man/fr/Makefile.am:
+	- Set mandir before setting man_MANS, to more closely match
+	  doc/man/Makefile.am. (DLR)
 - doc/syntax/python.nanorc:
 	- Improve string highlighting regexes. (Mike Frysinger)
 
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index da744bde..bde9bc25 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -1,7 +1,7 @@
-man_MANS = nano.1 nanorc.5 rnano.1
-
 mandir = @mandir@/fr
 
+man_MANS = nano.1 nanorc.5 rnano.1
+
 BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1