diff --git a/ChangeLog b/ChangeLog
index d3349a82a5d48a1179a2f063b723eb4e97c8706f..4704e4f051240e236af6b68c1bbc7d7d4e84856d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -414,6 +414,8 @@ CVS code -
 	  alphabetical order. (Benno Schulenberg)
 	- Change all occurrences of "file name" to "filename". (Benno
 	  Schulenberg)
+- doc/man/Makefile.am:
+	- Simplify the setting of SUBDIRS. (DLR)
 - doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1:
 	- Updated manpage translations by Jean-Philippe Guérard.
 - doc/nanorc.sample:
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index cf58ee2b0cc846546fb6041ea94ebcdc160b6aa5..560b721a11a5c750355a40ad605ebce143bae60c 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,7 +1,7 @@
-if USE_NLS
-SUBDIRS = fr
-else
 SUBDIRS =
+
+if USE_NLS
+SUBDIRS += fr
 endif
 
 man_MANS = nano.1 nanorc.5 rnano.1