diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index d6d2e2558e70..1a8db179f23c 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -205,6 +205,8 @@
         calendar
             de_DE.ISO8859-1
             ..
+            fr_FR.ISO_8859-1
+            ..
             hr_HR.ISO8859-2
             ..
             ru_RU.KOI8-R
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 588b37dcf6f9..638eb88b04aa 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -3,7 +3,8 @@
 
 PROG=	calendar
 SRCS=   calendar.c io.c day.c ostern.c paskha.c
-INTER=          de_DE.ISO8859-1 hr_HR.ISO8859-2 ru_RU.KOI8-R
+NO_WERROR=	yes
+INTER=          de_DE.ISO8859-1 fr_FR.ISO_8859-1 hr_HR.ISO8859-2 ru_RU.KOI8-R
 DE_LINKS=       de_DE.ISO_8859-1 de_DE.ISO8859-15 de_DE.ISO_8859-15
 HR_LINKS=       hr_HR.ISO_8859-2
 TEXTMODE?=	444
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index df618e4f43ac..ade4f0f17507 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -208,6 +208,8 @@ Strongly  oriented  toward  rock 'n' roll.
 U.S. holidays.
 This calendar should be updated yearly by the local system administrator
 so that roving holidays are set correctly for the current year.
+.It Pa calendar.french
+French calendar.
 .It Pa calendar.german
 German calendar.
 .It Pa calendar.russian
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 652829ef863d..9836adee0309 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -8,9 +8,10 @@
 #define _calendar_all_
 
 #include <calendar.world>
-#include <calendar.german>
-#include <calendar.usholiday>
 #include <calendar.croatian>
+#include <calendar.french>
+#include <calendar.german>
 #include <calendar.russian>
+#include <calendar.usholiday>
 
 #endif /* !_calendar_all_ */
diff --git a/usr.bin/calendar/calendars/calendar.french b/usr.bin/calendar/calendars/calendar.french
new file mode 100644
index 000000000000..e1c862de0cd0
--- /dev/null
+++ b/usr.bin/calendar/calendars/calendar.french
@@ -0,0 +1,12 @@
+/*
+ * French calendar file(s)
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _calendar_french_
+#define _calendar_french_
+
+#include <fr_FR.ISO_8859-1/calendar.all>
+
+#endif /* !_calendar_french_ */