summary refs log tree commit diff
path: root/src/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr.bin')
-rw-r--r--src/usr.bin/calendar/Makefile18
-rwxr-xr-xsrc/usr.bin/calendar/calendarbin0 -> 59574 bytes
-rw-r--r--src/usr.bin/calendar/calendar.1269
-rw-r--r--src/usr.bin/calendar/calendar.c261
-rw-r--r--src/usr.bin/calendar/calendar.h122
-rw-r--r--src/usr.bin/calendar/calendars/calendar.all21
-rw-r--r--src/usr.bin/calendar/calendars/calendar.birthday358
-rw-r--r--src/usr.bin/calendar/calendars/calendar.canada40
-rw-r--r--src/usr.bin/calendar/calendars/calendar.christian29
-rw-r--r--src/usr.bin/calendar/calendars/calendar.computer83
-rw-r--r--src/usr.bin/calendar/calendars/calendar.croatian12
-rw-r--r--src/usr.bin/calendar/calendars/calendar.discord387
-rw-r--r--src/usr.bin/calendar/calendars/calendar.fictional57
-rw-r--r--src/usr.bin/calendar/calendars/calendar.french12
-rw-r--r--src/usr.bin/calendar/calendars/calendar.german12
-rw-r--r--src/usr.bin/calendar/calendars/calendar.history504
-rw-r--r--src/usr.bin/calendar/calendars/calendar.holiday582
-rw-r--r--src/usr.bin/calendar/calendars/calendar.judaic36
-rw-r--r--src/usr.bin/calendar/calendars/calendar.music534
-rw-r--r--src/usr.bin/calendar/calendars/calendar.openbsd108
-rw-r--r--src/usr.bin/calendar/calendars/calendar.pagan70
-rw-r--r--src/usr.bin/calendar/calendars/calendar.russian12
-rw-r--r--src/usr.bin/calendar/calendars/calendar.space55
-rw-r--r--src/usr.bin/calendar/calendars/calendar.ushistory209
-rw-r--r--src/usr.bin/calendar/calendars/calendar.usholiday40
-rw-r--r--src/usr.bin/calendar/calendars/calendar.world18
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all17
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag42
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte202
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche32
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur45
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik57
-rw-r--r--src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft19
-rw-r--r--src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all14
-rw-r--r--src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes630
-rw-r--r--src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french12
-rw-r--r--src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies45
-rw-r--r--src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes354
-rw-r--r--src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all12
-rw-r--r--src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici37
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all17
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common151
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.history282
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk16
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox60
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan55
-rw-r--r--src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.primety396
-rw-r--r--src/usr.bin/calendar/day.c714
-rw-r--r--src/usr.bin/calendar/io.c455
-rw-r--r--src/usr.bin/calendar/ostern.c77
-rw-r--r--src/usr.bin/calendar/paskha.c54
-rw-r--r--src/usr.bin/calendar/pathnames.h39
-rw-r--r--src/usr.bin/calendar/pesach.c66
53 files changed, 7749 insertions, 0 deletions
diff --git a/src/usr.bin/calendar/Makefile b/src/usr.bin/calendar/Makefile
new file mode 100644
index 0000000..9c479dc
--- /dev/null
+++ b/src/usr.bin/calendar/Makefile
@@ -0,0 +1,18 @@
+#	$OpenBSD: Makefile,v 1.9 2004/12/10 20:47:30 mickey Exp $
+
+PROG=	calendar
+SRCS=   calendar.c io.c day.c pesach.c ostern.c paskha.c
+INTER=	de_DE.ISO_8859-1 hr_HR.ISO_8859-2 ru_RU.KOI8-R fr_FR.ISO8859-1
+
+beforeinstall:
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}/usr/share/calendar
+.for lang in ${INTER}
+	@test -d ${DESTDIR}/usr/share/calendar/${lang} || \
+		mkdir ${DESTDIR}/usr/share/calendar/${lang}
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+    		${.CURDIR}/calendars/${lang}/calendar.* \
+		${DESTDIR}/usr/share/calendar/${lang}; 
+.endfor
+
+.include <bsd.prog.mk>
diff --git a/src/usr.bin/calendar/calendar b/src/usr.bin/calendar/calendar
new file mode 100755
index 0000000..7cba954
--- /dev/null
+++ b/src/usr.bin/calendar/calendar
Binary files differdiff --git a/src/usr.bin/calendar/calendar.1 b/src/usr.bin/calendar/calendar.1
new file mode 100644
index 0000000..6c26103
--- /dev/null
+++ b/src/usr.bin/calendar/calendar.1
@@ -0,0 +1,269 @@
+.\"	$OpenBSD: calendar.1,v 1.36 2013/03/15 08:37:10 jmc Exp $
+.\"
+.\" Copyright (c) 1989, 1990, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
+.\"
+.Dd $Mdocdate: March 15 2013 $
+.Dt CALENDAR 1
+.Os
+.Sh NAME
+.Nm calendar
+.Nd reminder service
+.Sh SYNOPSIS
+.Nm calendar
+.Op Fl ab
+.Op Fl A Ar num
+.Op Fl B Ar num
+.Op Fl f Ar calendarfile
+.Sm off
+.Op Fl "t " Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd
+.Sm on
+.Sh DESCRIPTION
+The
+.Nm
+utility checks the current directory or the directory specified by the
+.Ev CALENDAR_DIR
+environment variable for a file named
+.Pa calendar
+and displays lines that begin with either today's date
+or tomorrow's.
+On Fridays, events on Friday through Monday are displayed.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl A Ar num
+Print lines from today and next
+.Ar num
+days (forward, future).
+.It Fl a
+Process the
+.Dq calendar
+files of all users and mail the results
+to them.
+This requires superuser privileges.
+.It Fl B Ar num
+Print lines from today and previous
+.Ar num
+days (backward, past).
+.It Fl b
+Enforce special date calculation mode for KOI8 calendars.
+.It Fl f Pa calendarfile
+Use
+.Pa calendarfile
+as the default calendar file.
+.Sm off
+.It Fl "t " Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd
+.Sm on
+Act like the specified value is
+.Dq today
+instead of using the current date.
+If yy is specified, but cc is not,
+a value for yy between 69 and 99 results in a cc value of 19.
+Otherwise, a cc value of 20 is used.
+.El
+.Pp
+To handle calendars in your national code table you can specify
+.Dq LANG=<locale_name>
+in the calendar file as early as possible.
+To handle national Easter names in the calendars,
+.Dq Easter=<national_name>
+(for Catholic Easter) or
+.Dq Paskha=<national_name>
+(for Orthodox Easter) can be used.
+.Pp
+The
+.Dq CALENDAR
+variable can be used to specify the style.
+Only
+.Sq Julian
+and
+.Sq Gregorian
+styles are currently supported.
+Use
+.Dq CALENDAR=
+to return to the default (Gregorian).
+.Pp
+To enforce special date calculation mode for Cyrillic calendars
+you should specify
+.Dq LANG=<local_name>
+and
+.Dq BODUN=<bodun_prefix>
+where <local_name> can be ru_RU.KOI8-R, uk_UA.KOI8-U or by_BY.KOI8-B.
+.Pp
+Other lines should begin with a month and day.
+They may be entered in almost any format, either numeric or as character
+strings.
+If proper locale is set, national months and weekdays
+names can be used.
+A single asterisk (`*') matches every month.
+A day without a month matches that day of every week.
+A month without a day matches the first of that month.
+Two numbers default to the month followed by the day.
+Lines with leading tabs default to the last entered date, allowing
+multiple line specifications for a single date.
+.Dq Easter
+(may be followed by a positive or negative integer) is Easter for this year.
+.Dq Paskha
+(may be followed by a positive or negative integer) is
+Orthodox Easter for this year.
+Weekdays may be followed by
+.Dq -4
+.Li ...
+.Dq +5
+(aliases last, first, second, third, fourth) for moving events like
+.Dq the last Monday in April .
+.Pp
+By convention, dates followed by an asterisk
+.Pq Sq *
+are not fixed, i.e., change
+from year to year.
+.Pp
+Day descriptions start after the first <tab> character in the line;
+if the line does not contain a <tab> character, it isn't printed out.
+If the first character in the line is a <tab> character, it is treated as
+the continuation of the previous description.
+.Pp
+The calendar file is preprocessed by
+.Xr cpp 1 ,
+allowing the inclusion of shared files such as company holidays or
+meetings.
+If the shared file is not referenced by a full pathname,
+.Xr cpp 1
+searches in the current (or home) directory first, and then in the
+directory
+.Pa /usr/share/calendar .
+Empty lines and lines protected by the C commenting syntax
+.Pq Li /* ... */
+are ignored.
+.Pp
+Some possible calendar entries
+(a \fB\et\fR sequence denotes a <tab> character):
+.Bd -unfilled -offset indent
+LANG=C
+Easter=Ostern
+
+#include <calendar.usholiday>
+#include <calendar.birthday>
+
+6/15\fB\et\fRJune 15 (if ambiguous, will default to month/day).
+Jun. 15\fB\et\fRJune 15.
+15 June\fB\et\fRJune 15.
+Thursday\fB\et\fREvery Thursday.
+June\fB\et\fREvery June 1st.
+15 *\fB\et\fR15th of every month.
+
+May Sun+2\fB\et\fRsecond Sunday in May (Muttertag)
+04/SunLast\fB\et\fRlast Sunday in April,
+\fB\et\fRsummer time in Europe
+Easter\fB\et\fREaster
+Ostern-2\fB\et\fRGood Friday (2 days before Easter)
+Paskha\fB\et\fROrthodox Easter
+.Ed
+.Sh FILES
+.Bl -tag -width ~/.calendar/calendar -compact
+.It Pa calendar
+File in current directory.
+.It Pa ~/.calendar
+Directory in the user's home directory (which
+.Nm
+changes into, if it exists).
+.It Pa ~/.calendar/calendar
+File to use if no calendar file exists in the current directory.
+.It Pa ~/.calendar/nomail
+.Nm
+will not send mail if this file exists.
+.It Pa calendar.all
+International and national calendar files.
+.It Pa calendar.birthday
+Births and deaths of famous (and not-so-famous) people.
+.It Pa calendar.canada
+Canadian holidays.
+.It Pa calendar.christian
+Christian holidays (should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year).
+.It Pa calendar.computer
+Days of special significance to computer people.
+.It Pa calendar.croatian
+Croatian calendar.
+.It Pa calendar.discord
+Discordian calendar (all rites reversed).
+.It Pa calendar.fictional
+Fantasy and fiction dates (mostly LOTR).
+.It Pa calendar.french
+French calendar.
+.It Pa calendar.german
+German calendar.
+.It Pa calendar.history
+Miscellaneous history.
+.It Pa calendar.holiday
+Other holidays (including the not-well-known, obscure, and
+.Em really
+obscure).
+.It Pa calendar.judaic
+Jewish holidays (should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year).
+.It Pa calendar.music
+Musical events, births, and deaths (strongly oriented toward rock n' roll).
+.It Pa calendar.openbsd
+.Ox
+related events.
+.It Pa calendar.pagan
+Pagan holidays, celebrations and festivals.
+.It Pa calendar.russian
+Russian calendar.
+.It Pa calendar.space
+Cosmic history.
+.It Pa calendar.ushistory
+U.S. history.
+.It Pa calendar.usholiday
+U.S. holidays.
+.It Pa calendar.world
+World wide calendar.
+.El
+.Sh SEE ALSO
+.Xr at 1 ,
+.Xr cal 1 ,
+.Xr cpp 1 ,
+.Xr mail 1 ,
+.Xr cron 8
+.Sh STANDARDS
+The
+.Nm
+program previously selected lines which had the correct date anywhere
+in the line.
+This is no longer true: the date is only recognized when it occurs
+at the beginning of a line.
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v7 .
+.Sh BUGS
+.Nm
+doesn't handle all Jewish holidays or moon phases.
diff --git a/src/usr.bin/calendar/calendar.c b/src/usr.bin/calendar/calendar.c
new file mode 100644
index 0000000..05b0d26
--- /dev/null
+++ b/src/usr.bin/calendar/calendar.c
@@ -0,0 +1,261 @@
+/*	$OpenBSD: calendar.c,v 1.28 2012/01/31 08:29:25 otto Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <err.h>
+#include <errno.h>
+#include <locale.h>
+#include <login_cap.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <tzfile.h>
+#include <unistd.h>
+
+#include "pathnames.h"
+#include "calendar.h"
+
+char *calendarFile = "calendar";  /* default calendar file */
+char *calendarHome = ".calendar"; /* HOME */
+char *calendarNoMail = "nomail";  /* don't sent mail if this file exists */
+
+struct passwd *pw;
+int doall = 0;
+time_t f_time = 0;
+int bodun_always = 0;
+
+int f_dayAfter = 0; /* days after current date */
+int f_dayBefore = 0; /* days before current date */
+int f_SetdayAfter = 0; /* calendar invoked with -A */
+
+struct specialev spev[NUMEV];
+
+void childsig(int);
+
+int
+main(int argc, char *argv[])
+{
+	int ch;
+	char *caldir;
+
+	(void)setlocale(LC_ALL, "");
+
+	while ((ch = getopt(argc, argv, "abf:t:A:B:-")) != -1)
+		switch (ch) {
+		case '-':		/* backward contemptible */
+		case 'a':
+			if (getuid())
+				errx(1, "%s", strerror(EPERM));
+			doall = 1;
+			break;
+
+		case 'b':
+			bodun_always++;
+			break;
+
+		case 'f': /* other calendar file */
+		        calendarFile = optarg;
+			break;
+
+		case 't': /* other date, undocumented, for tests */
+			if ((f_time = Mktime(optarg)) <= 0)
+				errx(1, "specified date is outside allowed range");
+			break;
+
+		case 'A': /* days after current date */
+			f_dayAfter = atoi(optarg);
+			f_SetdayAfter = 1;
+			break;
+
+		case 'B': /* days before current date */
+			f_dayBefore = atoi(optarg);
+			break;
+
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc)
+		usage();
+
+	/* use current time */
+	if (f_time <= 0)
+	    (void)time(&f_time);
+
+	if (f_dayBefore) {
+		/* Move back in time and only look forwards */
+		f_dayAfter += f_dayBefore;
+		f_time -= SECSPERDAY * f_dayBefore;
+		f_dayBefore = 0;
+	}
+	settime(&f_time);
+
+	if (doall) {
+		pid_t kid, deadkid;
+		int kidstat, kidreaped, runningkids;
+		int acstat;
+		struct stat sbuf;
+		time_t t;
+		unsigned int sleeptime;
+
+		signal(SIGCHLD, childsig);
+		runningkids = 0;
+		t = time(NULL);
+		while ((pw = getpwent()) != NULL) {
+			acstat = 0;
+			/* Avoid unnecessary forks.  The calendar file is only
+			 * opened as the user later; if it can't be opened,
+			 * it's no big deal.  Also, get to correct directory.
+			 * Note that in an NFS environment root may get EACCES
+			 * on a chdir(), in which case we have to fork.  As long as
+			 * we can chdir() we can stat(), unless the user is
+			 * modifying permissions while this is running.
+			 */
+			if (chdir(pw->pw_dir)) {
+				if (errno == EACCES)
+					acstat = 1;
+				else
+					continue;
+			}
+			if (stat(calendarFile, &sbuf) != 0) {
+				if (chdir(calendarHome)) {
+					if (errno == EACCES)
+						acstat = 1;
+					else
+						continue;
+				}
+				if (stat(calendarNoMail, &sbuf) == 0 ||
+				    stat(calendarFile, &sbuf) != 0)
+					continue;
+			}
+			sleeptime = USERTIMEOUT;
+			switch ((kid = fork())) {
+			case -1:	/* error */
+				warn("fork");
+				continue;
+			case 0:	/* child */
+				(void)setpgid(getpid(), getpid());
+				(void)setlocale(LC_ALL, "");
+				if (setusercontext(NULL, pw, pw->pw_uid,
+				    LOGIN_SETALL ^ LOGIN_SETLOGIN))
+					err(1, "unable to set user context (uid %u)",
+					    pw->pw_uid);
+				if (acstat) {
+					if (chdir(pw->pw_dir) ||
+					    stat(calendarFile, &sbuf) != 0 ||
+					    chdir(calendarHome) || 
+					    stat(calendarNoMail, &sbuf) == 0 ||
+					    stat(calendarFile, &sbuf) != 0)
+						exit(0);
+				}
+				cal();
+				exit(0);
+			}
+			/* parent: wait a reasonable time, then kill child if
+			 * necessary.
+			 */
+			runningkids++;
+			kidreaped = 0;
+			do {
+				sleeptime = sleep(sleeptime);
+				/* Note that there is the possibility, if the sleep
+				 * stops early due to some other signal, of the child
+				 * terminating and not getting detected during the next
+				 * sleep.  In that unlikely worst case, we just sleep
+				 * too long for that user.
+				 */
+				for (;;) {
+					deadkid = waitpid(-1, &kidstat, WNOHANG);
+					if (deadkid <= 0)
+						break;
+					runningkids--;
+					if (deadkid == kid) {
+						kidreaped = 1;
+						sleeptime = 0;
+					}
+				}
+			} while (sleeptime);
+
+			if (!kidreaped) {
+				/* It doesn't _really_ matter if the kill fails, e.g.
+				 * if there's only a zombie now.
+				 */
+				if (getpgid(kid) != getpgrp())
+					(void)killpg(getpgid(kid), SIGTERM);
+				else
+					(void)kill(kid, SIGTERM);
+				warnx("uid %u did not finish in time", pw->pw_uid);
+			}
+			if (time(NULL) - t >= SECSPERDAY)
+				errx(2, "'calendar -a' took more than a day; "
+				    "stopped at uid %u",
+				    pw->pw_uid);
+		}
+		for (;;) {
+			deadkid = waitpid(-1, &kidstat, WNOHANG);
+			if (deadkid <= 0)
+				break;
+			runningkids--;
+		}
+		if (runningkids)
+			warnx("%d child processes still running when "
+			    "'calendar -a' finished", runningkids);
+	} else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
+		if(!chdir(caldir))
+			cal();
+	} else
+		cal();
+
+	exit(0);
+}
+
+
+void
+usage(void)
+{
+	(void)fprintf(stderr,
+	    "usage: calendar [-ab] [-A num] [-B num] [-f calendarfile] "
+	    "[-t [[[cc]yy]mm]dd]\n");
+	exit(1);
+}
+
+
+void
+childsig(int signo)
+{
+}
diff --git a/src/usr.bin/calendar/calendar.h b/src/usr.bin/calendar/calendar.h
new file mode 100644
index 0000000..b6ea817
--- /dev/null
+++ b/src/usr.bin/calendar/calendar.h
@@ -0,0 +1,122 @@
+/*	$OpenBSD: calendar.h,v 1.13 2010/04/28 18:20:15 jsg Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+extern struct passwd *pw;
+extern int doall;
+extern int bodun_always;
+extern time_t f_time;
+extern struct tm *tp;
+extern char *calendarFile;
+extern char *calendarHome;
+extern char *optarg;
+
+struct fixs {
+	char *name;
+	int len;
+};
+
+struct event {
+	time_t	when;
+	char	print_date[31];
+	char	**desc;
+	char	*ldesc;
+	struct event	*next;
+};
+
+struct match {
+	time_t	when;
+	char	print_date[30];
+	int	bodun;
+	int	var;
+	struct match	*next;
+};
+
+struct specialev {
+	char *name;
+	int nlen;
+	char *uname;
+	int ulen;
+	int (*getev)(int);
+};
+
+void	 cal(void);
+void	 closecal(FILE *);
+int	 getday(char *);
+int	 getdayvar(char *);
+int	 getfield(char *, char **, int *);
+int	 getmonth(char *);
+int	 pesach(int);
+int	 easter(int);
+int	 paskha(int);
+void	 insert(struct event **, struct event *);
+struct match	*isnow(char *, int);
+FILE	*opencal(void);
+void	 settime(time_t *);
+time_t	 Mktime(char *);
+void	 usage(void);
+int	 foy(int);
+void	 variable_weekday(int *, int, int);
+void	 setnnames(void);
+
+/* some flags */
+#define	F_ISMONTH	0x01 /* month (Januar ...) */
+#define	F_ISDAY		0x02 /* day of week (Sun, Mon, ...) */
+/*#define	F_ISDAYVAR	0x04  variables day of week, like SundayLast */
+#define	F_SPECIAL	0x08 /* Events that occur once a year but don't track
+			      * calendar time--e.g.  Easter or easter depending
+			      * days */
+
+extern int f_dayAfter;	/* days after current date */
+extern int f_dayBefore;	/* days before current date */
+extern int f_SetdayAfter; /* calendar invoked with -A */
+
+/* Special events; see also setnnames() in day.c */
+/* '=' is not a valid character in a special event name */
+#define PESACH "pesach"
+#define PESACHLEN (sizeof(PESACH) - 1)
+#define EASTER "easter"
+#define EASTERNAMELEN (sizeof(EASTER) - 1)
+#define PASKHA "paskha"
+#define PASKHALEN (sizeof(PASKHA) - 1)
+
+/* calendars */
+extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
+extern u_long julian;
+
+#define NUMEV 3	/* Total number of such special events */
+extern struct specialev spev[NUMEV];
+
+/* For calendar -a, specify a maximum time (in seconds) to spend parsing
+ * each user's calendar files.  This prevents them from hanging calendar
+ * (e.g. by using named pipes)
+ */
+#define USERTIMEOUT 20
diff --git a/src/usr.bin/calendar/calendars/calendar.all b/src/usr.bin/calendar/calendars/calendar.all
new file mode 100644
index 0000000..172357d
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.all
@@ -0,0 +1,21 @@
+/*
+ * International and national calendar files
+ *
+ * $OpenBSD: calendar.all,v 1.5 2013/03/15 08:37:10 jmc Exp $
+ */
+
+#ifndef _calendar_all_
+#define _calendar_all_
+
+#include <calendar.world>
+#include <calendar.french>
+#include <calendar.german>
+#include <calendar.usholiday>
+#include <calendar.croatian>
+#include <calendar.russian>
+#include <calendar.discord>
+#include <calendar.ushistory>
+#include <calendar.space>
+#include <calendar.canada>
+
+#endif /* !_calendar_all_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.birthday b/src/usr.bin/calendar/calendars/calendar.birthday
new file mode 100644
index 0000000..8657e9c
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.birthday
@@ -0,0 +1,358 @@
+/*
+ * Birthday
+ *
+ * $OpenBSD: calendar.birthday,v 1.58 2014/03/06 17:36:28 jmc Exp $
+ */
+
+#ifndef _calendar_birthday_
+#define _calendar_birthday_
+
+01/01	Paul Revere born in Boston, 1735
+01/01	J.D. Salinger born, 1919
+01/01	Heinz Zemanek born in Vienna, Austria, 1920
+01/01	Dolores Haze (prototype for Lolita) born, 1935
+01/02	Isaac Asimov born in Petrovichi, Russia, 1920
+01/03	J.R.R. Tolkien born, 1892
+01/04	George Washington Carver born in Missouri, 1864
+01/04	Jakob Grimm born, 1785
+01/04	Wilhelm Beer born, 1797, first astronomer to map Mars
+01/05	DeWitt B. Brace born, 1859, inventor of spectrophotometer
+01/06	Millard Fillmore's birthday (let's party!)
+01/07	Nikola Tesla died in the Hotel New Yorker room 3327, 1943
+01/11	Alexander Hamilton born in Nevis, British West Indies, 1755/57?
+01/11	Albert Hofmann born in Baden, Switzerland 1906
+01/12	John Hancock born, 1737
+01/12	"Long" John Baldry is born in London, 1941
+01/13	Horatio Alger born, 1832
+01/13	Sophie Tucker born, 1884
+01/13	Wilhelm Wien born, 1864, Nobel prize for blackbody radiation laws
+01/14	Albert Schweitzer born, 1875
+01/15	Martin Luther King, Jr. born, 1929
+01/17	Benjamin Franklin born in Boston, 1706
+01/19	Edgar Allan Poe born in Boston, 1809
+01/19	Robert Edward Lee born in Stratford Estate, Virginia, 1807
+01/20	George Burns born, 1896
+01/20	Dr. Mendeleev died with a pen in his hand, 1907
+01/21	Lenin died, 1924
+01/21	Thomas Jonathan "Stonewall" Jackson born in Clarksburg, VA, 1824
+01/21	Ethan Allen born, 1738
+01/22	Sir Francis Bacon born, 1561
+01/23	Joseph Hewes born, 1730
+01/23	Ernst Abbe born, 1840, formulated diffraction theory
+01/23	Grigori Yefimovich Rasputin born, 1869
+01/23	Sergei M. Eisenstein born in Riga, Latvia, 1898
+01/23	Samuel Barber died, 1981
+01/24	John Belushi is born in Chicago, 1949
+01/25	Robert Burns born, 1759
+01/25	Virginia Woolf born, 1882
+01/25	W. Somerset Maugham born, 1874
+01/27	Samuel Gompers born, 1850
+01/29	Andre the Giant died, 1993
+01/30	Franklin Delano Roosevelt born in Hyde Park, New York, 1882
+01/31	Jackie Robinson born, 1919
+02/03	Gertrude Stein born, 1874
+02/03	Paul Auster born in Newark, N.J., 1947
+02/05	William Seward Burroughs born in St. Louis, MO, 1914
+02/05	Alex Harvey (SAHB) is born in Glasgow, Scotland, 1935
+02/06	Adam Weishaupt was born in Ingoldstadt, 1748
+02/06	King George VI of UK dies; his daughter becomes Elizabeth II, 1952
+02/07	Sinclair Lewis born, 1885
+02/08	Friedleib F. Runge born, 1795, father of paper chromatography
+02/08	Jules Verne born in Nantes, France, 1828
+02/08	Dmitry Ivanovich Mendeleev born, an excellent suit-case master, 1834
+02/09	George Hartmann born, designed astrolabes, timepieces, etc., 1489
+02/09	Fyodor Mikhailovich Dostoevsky died in St. Petersburg, Russia, 1881
+02/10	Charles Lamb born, 1775
+02/10	William Allen White born, 1868
+02/11	William Henry Fox Talbot born, 1800, photographic pioneer
+02/11	Thomas Edison born, 1847
+02/11	Sergei M. Eisenstein died in Moscow, Russia, 1988
+02/12	Abraham Lincoln born, 1809
+02/12	Charles Darwin born in Shrewsbury, England, 1809
+02/13	Feodor Ivanovich Chaliapin born in Oemet Tawi, near Kazan, 1873
+02/15	Galileo Galilei born in Pisa, Italy, 1564
+02/15	Susan B. Anthony born, 1820
+02/16	Pierre Bouguer born, 1698, founder of photometry
+02/17	Federic Eugene Ives born, 1856, pioneer of halftone process
+02/17	T. J. Watson, Sr. born, 1874
+02/17	Marion Anderson born, 1902
+02/18	Ernst Mach born, 1838, philosopher & optics pioneer
+02/18	Michelangelo Buonarroti dies in Rome, Italy, 1564
+02/19	Nicolas Copernicus born in Thorn, Poland, 1473
+02/20	Ludwig Boltzmann born, 1844, atomic physics pioneer
+02/21	Alexis De Rochon born, 1838, developed the spyglass
+02/22	George Washington born, 1732
+02/22	Pierre Jules Cesar Janssen born, 1824, found hydrogen in the sun
+02/23	W.E.B. DuBois born, 1868
+02/24	Wilhelm Grimm born, 1786
+02/24	Winslow Homer born, 1836
+02/25	Renoir born, 1841
+02/26	Dominique Francois Jean Arago born, 1786;
+		observed "Poisson's spot" cf June 21
+02/27	Marian Anderson born, 1897
+02/28	Michel de Mantaigne born, 1533
+02/29	Herman Hollerith born, 1860
+03/01	David Niven born, 1910
+03/02	Dr. Seuss born, 1904
+03/04	Casimir Pulaski born, 1747
+03/04	Gogol dies, 1852
+03/05	Joseph Stalin dies in Moscow, 1953
+03/05	John Belushi dies in Los Angeles, 1982
+03/06	Michelangelo Buonarroti born in Caprese, Italy, 1475
+03/07	Aristotle died, 322BC
+03/07	Sir John Frederick William Herschel born, 1792, astronomer
+03/08	Alvan Clark born, 1804, astronomer & lens manufacturer
+03/09	Howard Aiken born, 1900
+03/11	Douglas Adams born in Cambridge, England, 1952
+03/11	Robert Treat Paine born, 1731
+03/11	Vannevar Bush born, 1890
+03/12	Gustav Robert Kirchhoff born, 1824, physicist
+03/14	Albert Einstein born, 1879
+03/14	Casey Jones born, 1864
+03/14	Giovanni Virginio Schiaparelli born, 1835, astronomer;
+		named Mars "canals"
+03/14	Karl Marx died, 1883
+03/15	Julius Caesar assassinated by Brutus; Ides of March, 44BC
+03/15	J.J. Robert's Birthday in Liberia
+03/16	George Clymer born, 1739
+03/16	James Madison born, 1751
+03/18	Norbert Wiener dies, 1964
+03/19	Arthur C. Clarke died in Colombo, Sri Lanka, 2008
+03/21	Jean Baptiste Joseph Fourier born, 1768, mathematician & physicist
+03/22	Jack Kerouac born in Lowell MA, 1922
+03/23	Pierre Simon de Laplace born, 1749, mathematician & astronomer
+03/24	Harry Houdini born, 1874
+03/26	Benjamin Thompson born, 1753, Count Rumford; physicist
+03/26	David Packard died, 1996; age of 83
+03/27	Wilhelm Conrad Roentgen born, 1845, discoverer of X-rays
+03/27	Stanislaw Lem died, 2006
+03/30	Francisco Jose de Goya born, 1746
+03/30	Sean O'Casey born, 1880
+03/30	Vincent Van Gogh born, 1853
+03/30	Queen Elizabeth, the Queen Mother, died at the age of 101, 2002
+03/31	Rene Descartes born, 1596, mathematician & philosopher
+03/31	Nikolay Vasilyevich Gogol born, 1809
+04/03	Washington Irving born, 1783
+04/04	Andrey Tarkovsky born, 1932
+04/05	Thomas Hobbes born, 1588, philosopher
+04/05	Allen Ginsberg dies at age 70 in his East Village loft in
+	New York city, 1997
+04/08	Buddha born, 563 BC
+04/08	David Rittenhouse born, 1732, astronomer & mathematician
+04/09	Edward Muybridge born, 1830, motion-picture pioneer
+04/09	J. Presper Eckert born, 1919
+04/10	Commodore Matthew Calbraith Perry born, 1794
+04/10	William Booth born, 1829, founder of the Salvation Army
+04/11	Edsger Wybe Dijkstra was born at Rotterdam, 1930
+04/12	Feodor Ivanovich Chaliapin died in Paris, 1938
+04/13	Samuel Beckett born in Foxrock, County Dublin, 1906
+04/13	Thomas Jefferson born, 1743
+04/14	Christiaan Huygens born, 1629, physicist & astronomer;
+		discovered Saturn's rings
+04/15	Leonardo da Vinci born, 1452
+04/15	Leonhard Euler born in Basel, 1707
+04/15	Jean Genet died in Paris, 1986
+04/16	Charles (Charlie) Chaplin (Sir) born in London, 1889
+04/19	Andre Rene the Giant (Roussimoff) born in Grenoble, France, 1946
+04/20	Adolph Hitler born, 1889
+04/22	Kant born, 1724
+04/22	Lenin born, the best friend of all the children, 1870
+04/23	Shakespeare born, 1564
+04/28	James Monroe born, 1758
+04/28	Mussolini executed, 1945
+04/29	Jules Henri Poincare born, 1854, founder of topology
+04/29	William Randolph Hearst born in San Francisco, 1863
+04/29	Albert Hofmann died, 2008
+04/30	Karl Friedrich Gauss born, 1777, mathematician & astronomer
+04/30	Adolph Hitler committed suicide, 1945
+05/01	Little Walter (Marion Walter Jacobs) is born in Alexandria,
+		Louisiana, 1930
+05/02	Dr. Benjamin Spock born, 1903
+05/05	Karl Marx born, 1818
+05/09	Pinza died, 1957
+05/10	Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899
+05/11	Douglas Adams dies in Santa Barbara, 2001
+05/12	Florence Nightingale born in Florence, Italy, 1820
+05/13	Arthur S. Sullivan born, 1842
+05/15	Mike Oldfield is born in Essex, England, 1953
+05/19	Ho Chi Minh born, 1890
+05/21	Plato (Aristocles) born in Athens(?), 427BC
+05/24	Robert A. Moog born in New York City, 1934
+05/27	Hubert H. Humphrey born, 1911
+05/28	Dionne quintuplets born, 1934
+05/29	Gilbert Keith Chesterton born, 1874
+05/29	John Fitzgerald Kennedy born, 1917
+05/29	Patrick Henry born, 1736
+05/30	Mel (Melvin Jerome) Blanc born in San Francisco, 1908
+06/01	Brigham Young born, 1801
+06/01	Marilyn Monroe born, 1926
+06/02	Edward Elgar (Sir) born in Worcestershire, England, 1857
+06/03	Henry James born, 1811
+06/03	Franz Kafka dies in Praha, 1924
+06/03	Allen Ginsberg born in Newark, NJ, 1926
+06/07	(Eugene Henri) Paul Gauguin born, 1848
+06/07	George Bryan "Beau" Brummel born, 1778
+06/07	Alan Mathison Turing died, 1954
+06/08	Frank Lloyd Wright born in Richland Center, Wisconsin, 1867
+06/13	Alexander the Great dies (323BC)
+06/14	Ernesto "Che" Guevara de la Serna born in Rosario, Argentina, 1928
+06/16	Hammurabi the Great dies, Babylon, 1686 BC
+06/17	M.C. Escher born, 1898
+06/22	Carl Hubbell born, 1903
+06/22	Konrad Zuse born in Berlin, Germany, 1910
+06/22	Meryl Streep born in Summit, New Jersey, 1949
+06/23	Alan Mathison Turing born, Paddington, London, 1912
+06/25	Eric Arthur Blair (a.k.a. George Orwell) born, 1903
+06/26	William Thomson (a.k.a. Lord Kelvin) born, 1824
+06/26	Robert Morris dies, 2011
+06/27	Helen Keller born, 1880
+07/03	Franz Kafka born in Vienna, 1883
+07/04	Nathaniel Hawthorne born in Salem, Massachusetts, 1804
+07/04	John Adams and Thomas Jefferson die on same day, 1826
+07/06	John Paul Jones born, 1747
+07/07	P.T. Barnum dies, 1891
+07/08	Count Ferdinand von Zeppelin born, 1838
+07/10	John Calvin born, 1509
+07/10	Nikola Tesla born, 1856
+07/11	John Quincy Adams born, 1767
+07/12	Henry David Thoreau born, 1817
+07/15	Clement Clarke Moore born, 1779, author of "A Visit from
+		Saint Nicholas"
+07/18	Brian Auger is born in London, 1939
+07/20	Bruce Lee died in Hong Kong, 1973
+07/25	Robert Morris is born in Boston, 1932
+07/25	Steve Goodman is born in Chicago, 1948
+07/28	(Helen) Beatrix Potter born, 1866
+07/29	Mussolini born, 1883
+07/30	Emily Bronte born, 1818
+07/30	Henry Ford born, 1863
+08/01	Herman Melville born, 1819
+08/02	William Seward Burroughs dies of heart attack at age 83,
+	Lawrence KS, 1997
+08/02	Fela Kuti dies of AIDS-related heart failure in Lagos Nigeria, 1997
+08/03	Lenny Bruce dies of a morphine overdose, 1966
+08/05	Friedrich Engels died, 1895
+08/06	Edsger Wybe Dijkstra died after a long struggle with cancer, 2002
+08/08	Dustin Hoffman born in Los Angeles, 1937
+08/12	Thomas Mann's Death, 1955
+08/13	Annie Oakley born, 1860
+08/13	Fidel Castro born, 1926
+08/15	Louis Victor de Broglie born, 1892, physicist
+08/17	Mae West born, 1892/93
+08/18	Meriwether Lewis born, 1774
+08/20	Leon Trotsky assassinated, 1940
+08/21	Robert A. Moog died, 2005
+08/23	Gene Kelly born, 1912
+08/27	Lyndon B. Johnson born, 1908
+08/29	Oliver Wendell Holmes born, 1809, physician & father of the jurist
+08/30	John W. Mauchly born, 1907
+09/02	J.R.R. Tolkien died, 1973
+09/05	King Louis XIV of France born, 1638
+09/05	Raquel Welch born, 1942
+09/06	Word is received that Perry has reached the North Pole and died, 1909
+09/07	James Fenimore Cooper born in Burlington, NJ, 1789
+09/07	Queen Elizabeth I of England born, 1533
+09/08	King Richard I of England born, 1157
+09/08	Peter Sellers born in Southsea, England, 1925
+09/09	Chinese Communist Party Chairman Mao Tse-Tung dies at age 82, 1976
+09/09	Dennis Ritchie born, 1941
+09/12	Jesse Owens born, 1913
+09/12	Stanislaw Lem born in Lwow, Poland, 1921
+09/13	Walter Reed born, 1851
+09/15	Agatha Christie born in Torquay, England, 1890
+09/16	Allen Funt born in Brooklyn, NY, 1914
+09/17	Ken Kesey born in La Junta, CO, 1935
+09/18	Konstantin Eduardovich Tsiolkovsky born, 1857, father of rocket flight
+09/18	Greta Garbo born, 1905
+09/18	Jimi Hendrix dies from an overdose, 1970
+09/18	Leonhard Euler died in St. Petersburg, 1783
+09/19	President Garfield dies of wounds in Elberon, N.J., 1881
+09/19	Tsiolkovsky died, 1935
+09/20	Upton (Beall) Sinclair born, 1878
+09/21	H.G. (Herbert George) Wells born in Bromley, England, 1866
+09/21	Louis Joliet born, 1645
+09/23	Augustus (Gaius Octavius) Caesar born in Rome, 63 BC
+09/23	Euripides born in Salamis, Greece, 480 BC
+09/24	F. Scott Fitzgerald born, 1896
+09/26	Johnny Appleseed born, 1774
+09/26	T.S. (Thomas Stearns) Eliot born in St. Louis, 1888
+09/27	Thomas Nast born, 1840
+09/28	Pompey (Gnaeus Pompeius Magnus) born in Rome, 106BC
+09/28	Seymour Cray born, 1925
+09/29	Gene Autry born, 1907
+10/01	Jimmy Carter born, 1924
+10/02	Aristotle dies of indigestion, 322 BC
+10/02	Mohandas K. Gandhi born at Porbandar, Kathiawad, India, 1869
+10/04	John V. Atanasoff born, 1903
+10/05	Pablo Picasso born in Malaga, Spain, 1881
+10/05	Ray Kroc (founder of McDonald's) born, 1902
+10/09	Comandante Che Guevara "an artist of revolutionary warfare" executed
+	by CIA-supervised forces near Villagrande, Bolivia, 1967
+10/12	Dennis Ritchie died, 2011
+10/13	Lenny Bruce is born in New York City, 1925
+10/14	William Penn born in London, 1644
+10/14	Dwight David Eisenhower born, 1890
+10/15	Virgil (Publius Vergilius Maro) born near Mantua, Italy, 70 BC
+10/15	Pelham Grenville Wodehouse born, 1881
+10/15	Fela Kuti born in Abeokuta, Nigeria, 1938
+10/16	Noah Webster born, 1758
+10/16	Oscar (Fingal O'Flahertie Wills) Wilde born in Dublin, 1854
+10/16	Dr. Jonathan B. Postel dies at age 55, 1998
+10/17	Richard Mentor Johnson born, 1780, 9th V.P. of U.S.
+10/20	Jack Kerouac dies at the age of 47 in St. Petersburg, FL, 1969
+10/21	Alfred Nobel born in Stockholm, 1833
+10/27	Gerald M. Weinberg born, 1933
+10/27	James Cook is born, 1728
+10/31	Chiang Kai-Shek born, 1887
+10/31	Dale Evans born, 1912
+11/01	Joseph Stalin's burial, 1961
+11/02	Daniel Boone born near Reading, PA, 1734
+11/04	King William III of Orange born, 1650
+11/05	Roy Rogers born, 1912
+11/09	Carl Sagan born, 1934
+11/10	Martin Luther born in Eisleben, Germany, 1483
+11/10	Soviet President Leonid Brezhnev dies at age 75, 1982
+11/10	Ken Kesey died, 2001
+11/11	Fyodor Mikhailovich Dostoevsky born in Moscow, Russia, 1821
+11/11	Kurt Vonnegut, Jr, born in Indianapolis, 1922
+11/13	Robert Louis Stevenson born, 1850
+11/13	St. Augustine of Hippo born in Numidia, Algeria, 354
+11/18	Adam Weishaupt died in Gotha, 1830
+11/18	William S. Gilbert born, 1836
+11/18	Imogene Coca born, 1908
+11/20	Robert Fitzgerald Kennedy born, 1925
+11/24	Emir Kusturica born in Sarajevo, Bosnia-Herzegovina, 1954
+11/25	Chaucer's death (according to tradition), 1400
+11/26	Charles Schulz born in Minneapolis, 1922
+11/26	Norbert Wiener born, 1894
+11/27	Bruce Lee born in San Francisco, 1940
+11/28	Friedrich Engels born, 1820
+11/29	John Mayall is born in Cheshire, England, 1933
+11/30	Cleopatra died, 30 BC
+11/30	Mark Twain (Samuel Clemens) born in Florida, Missouri, 1835
+12/01	Woody Allen (Allen Stuart Konigsberg) born in Brooklyn, NY, 1935
+12/03	John von Neumann born, 1903
+12/04	Tommy Bolin dies of a heroin overdose in Miami, 1976
+12/05	Walt (Walter Elias) Disney born in Chicago, 1901
+12/06	Samich Laus brewing
+12/08	Horace (Quintus Horatius Flaccus) born in Venosa (Italy), 65BC
+12/08	James (Grover) Thurber born in Columbus, Ohio, 1894
+12/10	Emily Dickinson born, 1830
+12/12	E.G. Robinson born, 1893
+12/14	George Washington dies, 1799
+12/16	Arthur C. Clarke born in Somerset, England, 1917
+12/17	William Safire (Safir) born, 1929
+12/17	William Thomson (a.k.a. Lord Kelvin) died, 1907
+12/18	Konrad Zuse died, 1995
+12/19	Jean Genet born in Paris, 1910
+12/20	Carl Sagan died, 1996
+12/21	Benjamin Disraeli born, 1804
+12/22	Joseph Vissarionnovich Djugashvili (Stalin) born, 1879
+12/22	Samuel Beckett dies in Paris, 1989
+12/23	Joseph Smith born, 1805
+12/25	Isaac Newton (Sir) born in Lincolnshire, England, 1642
+12/25	Humphrey Bogart born in New York City, 1899
+12/26	Charles Babbage born, 1791
+12/29	Grigori Yefimovich Rasputin assasinated, 1916
+
+#endif /* !_calendar_birthday_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.canada b/src/usr.bin/calendar/calendars/calendar.canada
new file mode 100644
index 0000000..33acf01
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.canada
@@ -0,0 +1,40 @@
+/*
+ * Canada holiday
+ *
+ * $OpenBSD: calendar.canada,v 1.2 2013/03/16 07:52:29 jmc Exp $
+ */
+
+#ifndef _calendar_canada_
+#define _calendar_canada_
+
+01/01	New Year's Day (Statutory holiday)
+02/02	Groundhog Day
+02/14	St. Valentine's Day
+02/15	National Flag of Canada Day
+03/17	Saint Patrick's Day
+03/20*	Vernal Equinox
+03/SunSecond	Daylight Saving Time begins; clocks move forward (2nd Sunday of March)
+04/01	April Fool's Day
+Easter-2	Good Friday (Statutory holiday)
+Easter+1	Easter Monday
+05/SunSecond	Mother's Day (2nd Sunday of May)
+/* Holds up to and including 2015 */
+05/MonThird*	Victoria Day (Monday on or immediately before May 24)
+06/SunThird	Father's Day (3rd Sunday of June)
+06/21*	Summer Solstice
+06/24	St-Jean Baptiste
+07/01	Canada Day (Statutory holiday)
+08/MonFirst	August Civic Holiday
+09/MonFirst	Labour Day (Statutory holiday)
+09/22*	Autumnal Equinox
+10/MonSecond	Thanksgiving
+10/31	All Hallows' Eve (Halloween)
+11/SunFirst	Daylight Saving Time ends; clocks move back (1st Sunday in November)
+11/11	Remembrance Day
+12/21*	Winter Solstice
+12/24	Christmas Eve
+12/25	Christmas Day (Statutory holiday)
+12/26	Boxing Day
+12/31	New Year's Eve
+
+#endif /* !_calendar_canada_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.christian b/src/usr.bin/calendar/calendars/calendar.christian
new file mode 100644
index 0000000..177baac
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.christian
@@ -0,0 +1,29 @@
+/*
+ * Christian
+ *
+ * $OpenBSD: calendar.christian,v 1.4 1998/11/08 04:38:00 pjanzen Exp $
+ */
+
+#ifndef _calendar_christian_
+#define _calendar_christian_
+
+01/06	Epiphany
+Easter-47	Shrove Tuesday / Mardi Gras (day before Ash Wednesday)
+Easter-46	Ash Wednesday (First day of Lent)
+Easter-7	Palm Sunday (7 days before Easter)
+Easter-3	Maundy Thursday (3 days before Easter)
+Easter-2	Good Friday (2 days before Easter)
+Easter	Easter Sunday
+Easter+35	Rogation Sunday
+Easter+39	Ascension Day (10 days before Pentecost)
+Easter+49	Pentecost (Whitsunday)
+Easter+50	Whitmonday
+Easter+56	Trinity Sunday (7 days after Pentecost)
+Easter+60	Corpus Christi (11 days after Pentecost)
+10/18	Feast Day of St. Luke
+11/SunLast	First Sunday of Advent (4th Sunday before Christmas)
+12/SunFirst	First Sunday of Advent (4th Sunday before Christmas)
+12/06	St. Nicholas' Day
+12/25	Christmas
+
+#endif /* !_calendar_christian_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.computer b/src/usr.bin/calendar/calendars/calendar.computer
new file mode 100644
index 0000000..59abedc
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.computer
@@ -0,0 +1,83 @@
+/*
+ * Computer
+ *
+ * $OpenBSD: calendar.computer,v 1.15 2014/07/08 22:29:29 kirby Exp $
+ */
+
+#ifndef _calendar_computer_
+#define _calendar_computer_
+
+01/01	The Epoch (Time 0 for UNIX systems, Midnight GMT, 1970)
+01/01	ARPANET converts from NCP to TCP/IP - the Internet is born, 1983
+01/01	AT&T officially divests its local Bell companies, 1984
+01/03	Apple Computer incorporated, 1977
+01/08	American Telephone and Telegraph loses antitrust case, 1982
+01/08	Herman Hollerith patents first data processing computer, 1889
+01/08	Justice Dept. drops IBM suit, 1982
+01/10	First CDC 1604 delivered to Navy, 1960
+01/16	Set uid bit patent issued, to Dennis Ritchie, 1979
+01/16	The 1st IETF meeting at Linkabit, San Diego, CA; 21 Attendees; 1986
+01/17	Justice Dept. begins IBM anti-trust suit, 1969 (drops it, 01/08/82)
+01/22	Apple airs "1984" commercial during Superbowl XVIII, 1984
+01/24	DG Nova introduced, 1969
+01/25	First U.S. meeting of ALGOL definition committee, 1958
+01/26	EDVAC demonstrated, 1952
+01/31	Hewlett-Packard founded, 1939
+02/11	Last day of JOSS service at RAND Corp., 1966
+02/14	First micro-on-a-chip patented (TI), 1978
+02/15	ENIAC demonstrated, 1946
+03/01	First NPL (later PL/I) report published, 1964
+03/04	First Cray-1 shipped to Los Alamos, 1976
+03/09	"GOTO considered harmful" (E.W. Dijkstra) published in CACM, 1968
+03/14	LISP introduced, 1960
+03/21	NetBSD project born, 1993
+03/28	DEC announces PDP-11, 1970
+03/31	Eckert-Mauchly Computer Corp. founded, Phila, 1946
+04/01	Yourdon, Inc. founded, 1974  (It figures.)
+04/01	Apple Computer founded, 1976
+04/03	IBM 701 introduced, 1953
+04/04	Tandy Corp. acquires Radio Shack, 1963 (9 stores)
+04/07	IBM announces System/360, 1964
+04/09	ENIAC Project begun, 1943
+04/20	Apple announces the Apple ][ at the 1st West Coast Computer Faire, 1977
+04/28	Zilog Z-80 introduced
+05/06	EDSAC demonstrated, 1949
+05/01	First BASIC program run at Dartmouth, 1964
+05/16	First report on SNOBOL distributed (within BTL), 1963
+05/21	DEC announces PDP-8, 1965
+05/22	Ethernet first described, 1973
+05/27	First joint meeting of U.S. and European ALGOL definition cte., 1958
+05/28	First meeting of COBOL definition cte. (eventually CODASYL), 1959
+05/30	Colossus Mark II, 1944
+06/02	First issue of Computerworld, 1967
+06/10	First Apple II shipped, 1977
+06/15	UNIVAC I delivered to the Census Bureau, 1951
+06/16	First programming error at Census Bureau, 1951 (apocryphal)
+06/19	X Window System announced, 1984
+06/19	FreeBSD project born, 1993
+06/23	IBM unbundles software, 1969
+06/30	First advanced degree on computer related topic: to H. Karamanian,
+	Temple Univ., Phila, 1948, for symbolic differentiation on the ENIAC
+07/08	Bell Telephone Co. formed (predecessor of AT&T), 1877
+07/08	CDC incorporated, 1957
+07/22	Berkeley rescinded the 3rd term of BSD license, 1999
+08/14	First Unix-based mallet created, 1954
+08/14	IBM PC announced, 1981
+08/17	MD5 collision found by Chinese researchers, 2004
+08/22	CDC 6600 introduced, 1963
+08/23	DEC founded, 1957
+09/09	Unix billennium begins at 01:46:40 UTC, 2001
+09/15	ACM founded, 1947
+09/20	Harlan Herrick runs first FORTRAN program, 1954
+10/02	First robotics-based CAM, 1939
+10/06	First GPSS manual published, 1961
+10/08	First VisiCalc prototype, 1978
+10/12	Univac gives contract for SIMULA compiler to Nygaard and Dahl, 1962
+10/14	British Computer Society founded, 1957
+10/15	First FORTRAN Programmer's Reference Manual published, 1956
+10/20	Zurich ALGOL report published, 1958
+10/25	DEC announces VAX-11/780, 1978
+11/04	UNIVAC I program predicts Eisenhower victory based on 7% of votes, 1952
+12/08	First Ph.D. awarded by Computer Science Dept, Univ. of Penna, 1965
+
+#endif /* !_calendar_computer_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.croatian b/src/usr.bin/calendar/calendars/calendar.croatian
new file mode 100644
index 0000000..9c037fe
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.croatian
@@ -0,0 +1,12 @@
+/*
+ * Croatian calendar files
+ *
+ * $OpenBSD: calendar.croatian,v 1.1 1996/12/05 06:04:45 millert Exp $
+ */
+
+#ifndef _calendar_croatian_
+#define _calendar_croatian_
+
+#include <hr_HR.ISO_8859-2/calendar.all>
+
+#endif /* !_calendar_croatian_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.discord b/src/usr.bin/calendar/calendars/calendar.discord
new file mode 100644
index 0000000..5bd0aa0
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.discord
@@ -0,0 +1,387 @@
+/*
+ * Discordian calendar
+ *
+ * $OpenBSD: calendar.discord,v 1.2 2006/06/14 16:33:23 mickey Exp $
+ */
+
+#ifndef _calendar_discord_
+#define _calendar_discord_
+
+01/01	Sweetmorn, day 1 in the season of Chaos, 3172.
+01/02	Boomtime, day 2 in the season of Chaos, 3172.
+01/03	Pungenday, day 3 in the season of Chaos, 3172.
+01/04	Prickle-Prickle, day 4 in the season of Chaos, 3172.
+01/05	Setting Orange, day 5 in the season of Chaos, 3172.
+	It is the sacred Apostle Holyday of Mungday.
+01/06	Sweetmorn, day 6 in the season of Chaos, 3172.
+01/07	Boomtime, day 7 in the season of Chaos, 3172.
+01/08	Pungenday, day 8 in the season of Chaos, 3172.
+01/09	Prickle-Prickle, day 9 in the season of Chaos, 3172.
+01/10	Setting Orange, day 10 in the season of Chaos, 3172.
+01/11	Sweetmorn, day 11 in the season of Chaos, 3172.
+01/12	Boomtime, day 12 in the season of Chaos, 3172.
+01/13	Pungenday, day 13 in the season of Chaos, 3172.
+01/14	Prickle-Prickle, day 14 in the season of Chaos, 3172.
+01/15	Setting Orange, day 15 in the season of Chaos, 3172.
+01/16	Sweetmorn, day 16 in the season of Chaos, 3172.
+01/17	Boomtime, day 17 in the season of Chaos, 3172.
+01/18	Pungenday, day 18 in the season of Chaos, 3172.
+01/19	Prickle-Prickle, day 19 in the season of Chaos, 3172.
+01/20	Setting Orange, day 20 in the season of Chaos, 3172.
+01/21	Sweetmorn, day 21 in the season of Chaos, 3172.
+01/22	Boomtime, day 22 in the season of Chaos, 3172.
+01/23	Pungenday, day 23 in the season of Chaos, 3172.
+01/24	Prickle-Prickle, day 24 in the season of Chaos, 3172.
+01/25	Setting Orange, day 25 in the season of Chaos, 3172.
+01/26	Sweetmorn, day 26 in the season of Chaos, 3172.
+01/27	Boomtime, day 27 in the season of Chaos, 3172.
+01/28	Pungenday, day 28 in the season of Chaos, 3172.
+01/29	Prickle-Prickle, day 29 in the season of Chaos, 3172.
+01/30	Setting Orange, day 30 in the season of Chaos, 3172.
+01/31	Sweetmorn, day 31 in the season of Chaos, 3172.
+02/01	Boomtime, day 32 in the season of Chaos, 3172.
+02/02	Pungenday, day 33 in the season of Chaos, 3172.
+02/03	Prickle-Prickle, day 34 in the season of Chaos, 3172.
+02/04	Setting Orange, day 35 in the season of Chaos, 3172.
+02/05	Sweetmorn, day 36 in the season of Chaos, 3172.
+02/06	Boomtime, day 37 in the season of Chaos, 3172.
+02/07	Pungenday, day 38 in the season of Chaos, 3172.
+02/08	Prickle-Prickle, day 39 in the season of Chaos, 3172.
+02/09	Setting Orange, day 40 in the season of Chaos, 3172.
+02/10	Sweetmorn, day 41 in the season of Chaos, 3172.
+02/11	Boomtime, day 42 in the season of Chaos, 3172.
+02/12	Pungenday, day 43 in the season of Chaos, 3172.
+02/13	Prickle-Prickle, day 44 in the season of Chaos, 3172.
+02/14	Setting Orange, day 45 in the season of Chaos, 3172.
+02/15	Sweetmorn, day 46 in the season of Chaos, 3172.
+02/16	Boomtime, day 47 in the season of Chaos, 3172.
+02/17	Pungenday, day 48 in the season of Chaos, 3172.
+02/18	Prickle-Prickle, day 49 in the season of Chaos, 3172.
+02/19	Setting Orange, day 50 in the season of Chaos, 3172.
+	It is the sacred Season Holyday of Chaoflux.
+02/20	Sweetmorn, day 51 in the season of Chaos, 3172.
+02/21	Boomtime, day 52 in the season of Chaos, 3172.
+02/22	Pungenday, day 53 in the season of Chaos, 3172.
+02/23	Prickle-Prickle, day 54 in the season of Chaos, 3172.
+02/24	Setting Orange, day 55 in the season of Chaos, 3172.
+02/25	Sweetmorn, day 56 in the season of Chaos, 3172.
+02/26	Boomtime, day 57 in the season of Chaos, 3172.
+02/27	Pungenday, day 58 in the season of Chaos, 3172.
+02/28	Prickle-Prickle, day 59 in the season of Chaos, 3172.
+	Saint Tib's Day, day between 59 and 60 in the season of Chaos, 3172.
+03/01	Setting Orange, day 60 in the season of Chaos, 3172.
+03/02	Sweetmorn, day 61 in the season of Chaos, 3172.
+03/03	Boomtime, day 62 in the season of Chaos, 3172.
+03/04	Pungenday, day 63 in the season of Chaos, 3172.
+03/05	Prickle-Prickle, day 64 in the season of Chaos, 3172.
+03/06	Setting Orange, day 65 in the season of Chaos, 3172.
+03/07	Sweetmorn, day 66 in the season of Chaos, 3172.
+03/08	Boomtime, day 67 in the season of Chaos, 3172.
+03/09	Pungenday, day 68 in the season of Chaos, 3172.
+03/10	Prickle-Prickle, day 69 in the season of Chaos, 3172.
+03/11	Setting Orange, day 70 in the season of Chaos, 3172.
+03/12	Sweetmorn, day 71 in the season of Chaos, 3172.
+03/13	Boomtime, day 72 in the season of Chaos, 3172.
+03/14	Pungenday, day 73 in the season of Chaos, 3172.
+03/15	Prickle-Prickle, day 1 in the season of Discord, 3172.
+03/16	Setting Orange, day 2 in the season of Discord, 3172.
+03/17	Sweetmorn, day 3 in the season of Discord, 3172.
+03/18	Boomtime, day 4 in the season of Discord, 3172.
+03/19	Pungenday, day 5 in the season of Discord, 3172.
+	It is the sacred Apostle Holyday of Mojoday.
+03/20	Prickle-Prickle, day 6 in the season of Discord, 3172.
+03/21	Setting Orange, day 7 in the season of Discord, 3172.
+03/22	Sweetmorn, day 8 in the season of Discord, 3172.
+03/23	Boomtime, day 9 in the season of Discord, 3172.
+03/24	Pungenday, day 10 in the season of Discord, 3172.
+03/25	Prickle-Prickle, day 11 in the season of Discord, 3172.
+03/26	Setting Orange, day 12 in the season of Discord, 3172.
+03/27	Sweetmorn, day 13 in the season of Discord, 3172.
+03/28	Boomtime, day 14 in the season of Discord, 3172.
+03/29	Pungenday, day 15 in the season of Discord, 3172.
+03/30	Prickle-Prickle, day 16 in the season of Discord, 3172.
+03/31	Setting Orange, day 17 in the season of Discord, 3172.
+04/01	Sweetmorn, day 18 in the season of Discord, 3172.
+04/02	Boomtime, day 19 in the season of Discord, 3172.
+04/03	Pungenday, day 20 in the season of Discord, 3172.
+04/04	Prickle-Prickle, day 21 in the season of Discord, 3172.
+04/05	Setting Orange, day 22 in the season of Discord, 3172.
+04/06	Sweetmorn, day 23 in the season of Discord, 3172.
+04/07	Boomtime, day 24 in the season of Discord, 3172.
+04/08	Pungenday, day 25 in the season of Discord, 3172.
+04/09	Prickle-Prickle, day 26 in the season of Discord, 3172.
+04/10	Setting Orange, day 27 in the season of Discord, 3172.
+04/11	Sweetmorn, day 28 in the season of Discord, 3172.
+04/12	Boomtime, day 29 in the season of Discord, 3172.
+04/13	Pungenday, day 30 in the season of Discord, 3172.
+04/14	Prickle-Prickle, day 31 in the season of Discord, 3172.
+04/15	Setting Orange, day 32 in the season of Discord, 3172.
+04/16	Sweetmorn, day 33 in the season of Discord, 3172.
+04/17	Boomtime, day 34 in the season of Discord, 3172.
+04/18	Pungenday, day 35 in the season of Discord, 3172.
+04/19	Prickle-Prickle, day 36 in the season of Discord, 3172.
+04/20	Setting Orange, day 37 in the season of Discord, 3172.
+04/21	Sweetmorn, day 38 in the season of Discord, 3172.
+04/22	Boomtime, day 39 in the season of Discord, 3172.
+04/23	Pungenday, day 40 in the season of Discord, 3172.
+04/24	Prickle-Prickle, day 41 in the season of Discord, 3172.
+04/25	Setting Orange, day 42 in the season of Discord, 3172.
+04/26	Sweetmorn, day 43 in the season of Discord, 3172.
+04/27	Boomtime, day 44 in the season of Discord, 3172.
+04/28	Pungenday, day 45 in the season of Discord, 3172.
+04/29	Prickle-Prickle, day 46 in the season of Discord, 3172.
+04/30	Setting Orange, day 47 in the season of Discord, 3172.
+05/01	Sweetmorn, day 48 in the season of Discord, 3172.
+05/02	Boomtime, day 49 in the season of Discord, 3172.
+05/03	Pungenday, day 50 in the season of Discord, 3172.
+	It is the sacred Season Holyday of Discoflux.
+05/04	Prickle-Prickle, day 51 in the season of Discord, 3172.
+05/05	Setting Orange, day 52 in the season of Discord, 3172.
+05/06	Sweetmorn, day 53 in the season of Discord, 3172.
+05/07	Boomtime, day 54 in the season of Discord, 3172.
+05/08	Pungenday, day 55 in the season of Discord, 3172.
+05/09	Prickle-Prickle, day 56 in the season of Discord, 3172.
+05/10	Setting Orange, day 57 in the season of Discord, 3172.
+05/11	Sweetmorn, day 58 in the season of Discord, 3172.
+05/12	Boomtime, day 59 in the season of Discord, 3172.
+05/13	Pungenday, day 60 in the season of Discord, 3172.
+05/14	Prickle-Prickle, day 61 in the season of Discord, 3172.
+05/15	Setting Orange, day 62 in the season of Discord, 3172.
+05/16	Sweetmorn, day 63 in the season of Discord, 3172.
+05/17	Boomtime, day 64 in the season of Discord, 3172.
+05/18	Pungenday, day 65 in the season of Discord, 3172.
+05/19	Prickle-Prickle, day 66 in the season of Discord, 3172.
+05/20	Setting Orange, day 67 in the season of Discord, 3172.
+05/21	Sweetmorn, day 68 in the season of Discord, 3172.
+05/22	Boomtime, day 69 in the season of Discord, 3172.
+05/23	Pungenday, day 70 in the season of Discord, 3172.
+05/24	Prickle-Prickle, day 71 in the season of Discord, 3172.
+05/25	Setting Orange, day 72 in the season of Discord, 3172.
+05/26	Sweetmorn, day 73 in the season of Discord, 3172.
+05/27	Boomtime, day 1 in the season of Confusion, 3172.
+05/28	Pungenday, day 2 in the season of Confusion, 3172.
+05/29	Prickle-Prickle, day 3 in the season of Confusion, 3172.
+05/30	Setting Orange, day 4 in the season of Confusion, 3172.
+05/31	Sweetmorn, day 5 in the season of Confusion, 3172.
+	It is the sacred Apostle Holyday of Syaday.
+06/01	Boomtime, day 6 in the season of Confusion, 3172.
+06/02	Pungenday, day 7 in the season of Confusion, 3172.
+06/03	Prickle-Prickle, day 8 in the season of Confusion, 3172.
+06/04	Setting Orange, day 9 in the season of Confusion, 3172.
+06/05	Sweetmorn, day 10 in the season of Confusion, 3172.
+06/06	Boomtime, day 11 in the season of Confusion, 3172.
+06/07	Pungenday, day 12 in the season of Confusion, 3172.
+06/08	Prickle-Prickle, day 13 in the season of Confusion, 3172.
+06/09	Setting Orange, day 14 in the season of Confusion, 3172.
+06/10	Sweetmorn, day 15 in the season of Confusion, 3172.
+06/11	Boomtime, day 16 in the season of Confusion, 3172.
+06/12	Pungenday, day 17 in the season of Confusion, 3172.
+06/13	Prickle-Prickle, day 18 in the season of Confusion, 3172.
+06/14	Setting Orange, day 19 in the season of Confusion, 3172.
+06/15	Sweetmorn, day 20 in the season of Confusion, 3172.
+06/16	Boomtime, day 21 in the season of Confusion, 3172.
+06/17	Pungenday, day 22 in the season of Confusion, 3172.
+06/18	Prickle-Prickle, day 23 in the season of Confusion, 3172.
+06/19	Setting Orange, day 24 in the season of Confusion, 3172.
+06/20	Sweetmorn, day 25 in the season of Confusion, 3172.
+06/21	Boomtime, day 26 in the season of Confusion, 3172.
+06/22	Pungenday, day 27 in the season of Confusion, 3172.
+06/23	Prickle-Prickle, day 28 in the season of Confusion, 3172.
+06/24	Setting Orange, day 29 in the season of Confusion, 3172.
+06/25	Sweetmorn, day 30 in the season of Confusion, 3172.
+06/26	Boomtime, day 31 in the season of Confusion, 3172.
+06/27	Pungenday, day 32 in the season of Confusion, 3172.
+06/28	Prickle-Prickle, day 33 in the season of Confusion, 3172.
+06/29	Setting Orange, day 34 in the season of Confusion, 3172.
+06/30	Sweetmorn, day 35 in the season of Confusion, 3172.
+07/01	Boomtime, day 36 in the season of Confusion, 3172.
+07/02	Pungenday, day 37 in the season of Confusion, 3172.
+07/03	Prickle-Prickle, day 38 in the season of Confusion, 3172.
+07/04	Setting Orange, day 39 in the season of Confusion, 3172.
+07/05	Sweetmorn, day 40 in the season of Confusion, 3172.
+07/06	Boomtime, day 41 in the season of Confusion, 3172.
+07/07	Pungenday, day 42 in the season of Confusion, 3172.
+07/08	Prickle-Prickle, day 43 in the season of Confusion, 3172.
+07/09	Setting Orange, day 44 in the season of Confusion, 3172.
+07/10	Sweetmorn, day 45 in the season of Confusion, 3172.
+07/11	Boomtime, day 46 in the season of Confusion, 3172.
+07/12	Pungenday, day 47 in the season of Confusion, 3172.
+07/13	Prickle-Prickle, day 48 in the season of Confusion, 3172.
+07/14	Setting Orange, day 49 in the season of Confusion, 3172.
+07/15	Sweetmorn, day 50 in the season of Confusion, 3172.
+	It is the sacred Season Holyday of Confuflux.
+07/16	Boomtime, day 51 in the season of Confusion, 3172.
+07/17	Pungenday, day 52 in the season of Confusion, 3172.
+07/18	Prickle-Prickle, day 53 in the season of Confusion, 3172.
+07/19	Setting Orange, day 54 in the season of Confusion, 3172.
+07/20	Sweetmorn, day 55 in the season of Confusion, 3172.
+07/21	Boomtime, day 56 in the season of Confusion, 3172.
+07/22	Pungenday, day 57 in the season of Confusion, 3172.
+07/23	Prickle-Prickle, day 58 in the season of Confusion, 3172.
+07/24	Setting Orange, day 59 in the season of Confusion, 3172.
+07/25	Sweetmorn, day 60 in the season of Confusion, 3172.
+07/26	Boomtime, day 61 in the season of Confusion, 3172.
+07/27	Pungenday, day 62 in the season of Confusion, 3172.
+07/28	Prickle-Prickle, day 63 in the season of Confusion, 3172.
+07/29	Setting Orange, day 64 in the season of Confusion, 3172.
+07/30	Sweetmorn, day 65 in the season of Confusion, 3172.
+07/31	Boomtime, day 66 in the season of Confusion, 3172.
+08/01	Pungenday, day 67 in the season of Confusion, 3172.
+08/02	Prickle-Prickle, day 68 in the season of Confusion, 3172.
+08/03	Setting Orange, day 69 in the season of Confusion, 3172.
+08/04	Sweetmorn, day 70 in the season of Confusion, 3172.
+08/05	Boomtime, day 71 in the season of Confusion, 3172.
+08/06	Pungenday, day 72 in the season of Confusion, 3172.
+08/07	Prickle-Prickle, day 73 in the season of Confusion, 3172.
+08/08	Setting Orange, day 1 in the season of Bureaucracy, 3172.
+08/09	Sweetmorn, day 2 in the season of Bureaucracy, 3172.
+08/10	Boomtime, day 3 in the season of Bureaucracy, 3172.
+08/11	Pungenday, day 4 in the season of Bureaucracy, 3172.
+08/12	Prickle-Prickle, day 5 in the season of Bureaucracy, 3172.
+	It is the sacred Apostle Holyday of Zaraday.
+08/13	Setting Orange, day 6 in the season of Bureaucracy, 3172.
+08/14	Sweetmorn, day 7 in the season of Bureaucracy, 3172.
+08/15	Boomtime, day 8 in the season of Bureaucracy, 3172.
+08/16	Pungenday, day 9 in the season of Bureaucracy, 3172.
+08/17	Prickle-Prickle, day 10 in the season of Bureaucracy, 3172.
+08/18	Setting Orange, day 11 in the season of Bureaucracy, 3172.
+08/19	Sweetmorn, day 12 in the season of Bureaucracy, 3172.
+08/20	Boomtime, day 13 in the season of Bureaucracy, 3172.
+08/21	Pungenday, day 14 in the season of Bureaucracy, 3172.
+08/22	Prickle-Prickle, day 15 in the season of Bureaucracy, 3172.
+08/23	Setting Orange, day 16 in the season of Bureaucracy, 3172.
+08/24	Sweetmorn, day 17 in the season of Bureaucracy, 3172.
+08/25	Boomtime, day 18 in the season of Bureaucracy, 3172.
+08/26	Pungenday, day 19 in the season of Bureaucracy, 3172.
+08/27	Prickle-Prickle, day 20 in the season of Bureaucracy, 3172.
+08/28	Setting Orange, day 21 in the season of Bureaucracy, 3172.
+08/29	Sweetmorn, day 22 in the season of Bureaucracy, 3172.
+08/30	Boomtime, day 23 in the season of Bureaucracy, 3172.
+08/31	Pungenday, day 24 in the season of Bureaucracy, 3172.
+09/01	Prickle-Prickle, day 25 in the season of Bureaucracy, 3172.
+09/02	Setting Orange, day 26 in the season of Bureaucracy, 3172.
+09/03	Sweetmorn, day 27 in the season of Bureaucracy, 3172.
+09/04	Boomtime, day 28 in the season of Bureaucracy, 3172.
+09/05	Pungenday, day 29 in the season of Bureaucracy, 3172.
+09/06	Prickle-Prickle, day 30 in the season of Bureaucracy, 3172.
+09/07	Setting Orange, day 31 in the season of Bureaucracy, 3172.
+09/08	Sweetmorn, day 32 in the season of Bureaucracy, 3172.
+09/09	Boomtime, day 33 in the season of Bureaucracy, 3172.
+09/10	Pungenday, day 34 in the season of Bureaucracy, 3172.
+09/11	Prickle-Prickle, day 35 in the season of Bureaucracy, 3172.
+09/12	Setting Orange, day 36 in the season of Bureaucracy, 3172.
+09/13	Sweetmorn, day 37 in the season of Bureaucracy, 3172.
+09/14	Boomtime, day 38 in the season of Bureaucracy, 3172.
+09/15	Pungenday, day 39 in the season of Bureaucracy, 3172.
+09/16	Prickle-Prickle, day 40 in the season of Bureaucracy, 3172.
+09/17	Setting Orange, day 41 in the season of Bureaucracy, 3172.
+09/18	Sweetmorn, day 42 in the season of Bureaucracy, 3172.
+09/19	Boomtime, day 43 in the season of Bureaucracy, 3172.
+09/20	Pungenday, day 44 in the season of Bureaucracy, 3172.
+09/21	Prickle-Prickle, day 45 in the season of Bureaucracy, 3172.
+09/22	Setting Orange, day 46 in the season of Bureaucracy, 3172.
+09/23	Sweetmorn, day 47 in the season of Bureaucracy, 3172.
+09/24	Boomtime, day 48 in the season of Bureaucracy, 3172.
+09/25	Pungenday, day 49 in the season of Bureaucracy, 3172.
+09/26	Prickle-Prickle, day 50 in the season of Bureaucracy, 3172.
+	It is the sacred Season Holyday of Bureflux.
+09/27	Setting Orange, day 51 in the season of Bureaucracy, 3172.
+09/28	Sweetmorn, day 52 in the season of Bureaucracy, 3172.
+09/29	Boomtime, day 53 in the season of Bureaucracy, 3172.
+09/30	Pungenday, day 54 in the season of Bureaucracy, 3172.
+10/01	Prickle-Prickle, day 55 in the season of Bureaucracy, 3172.
+10/02	Setting Orange, day 56 in the season of Bureaucracy, 3172.
+10/03	Sweetmorn, day 57 in the season of Bureaucracy, 3172.
+10/04	Boomtime, day 58 in the season of Bureaucracy, 3172.
+10/05	Pungenday, day 59 in the season of Bureaucracy, 3172.
+10/06	Prickle-Prickle, day 60 in the season of Bureaucracy, 3172.
+10/07	Setting Orange, day 61 in the season of Bureaucracy, 3172.
+10/08	Sweetmorn, day 62 in the season of Bureaucracy, 3172.
+10/09	Boomtime, day 63 in the season of Bureaucracy, 3172.
+10/10	Pungenday, day 64 in the season of Bureaucracy, 3172.
+10/11	Prickle-Prickle, day 65 in the season of Bureaucracy, 3172.
+10/12	Setting Orange, day 66 in the season of Bureaucracy, 3172.
+10/13	Sweetmorn, day 67 in the season of Bureaucracy, 3172.
+10/14	Boomtime, day 68 in the season of Bureaucracy, 3172.
+10/15	Pungenday, day 69 in the season of Bureaucracy, 3172.
+10/16	Prickle-Prickle, day 70 in the season of Bureaucracy, 3172.
+10/17	Setting Orange, day 71 in the season of Bureaucracy, 3172.
+10/18	Sweetmorn, day 72 in the season of Bureaucracy, 3172.
+10/19	Boomtime, day 73 in the season of Bureaucracy, 3172.
+10/20	Pungenday, day 1 in the season of The Aftermath, 3172.
+10/21	Prickle-Prickle, day 2 in the season of The Aftermath, 3172.
+10/22	Setting Orange, day 3 in the season of The Aftermath, 3172.
+10/23	Sweetmorn, day 4 in the season of The Aftermath, 3172.
+10/24	Boomtime, day 5 in the season of The Aftermath, 3172.
+	It is the sacred Apostle Holyday of Maladay.
+10/25	Pungenday, day 6 in the season of The Aftermath, 3172.
+10/26	Prickle-Prickle, day 7 in the season of The Aftermath, 3172.
+10/27	Setting Orange, day 8 in the season of The Aftermath, 3172.
+10/28	Sweetmorn, day 9 in the season of The Aftermath, 3172.
+10/29	Boomtime, day 10 in the season of The Aftermath, 3172.
+10/30	Pungenday, day 11 in the season of The Aftermath, 3172.
+10/31	Prickle-Prickle, day 12 in the season of The Aftermath, 3172.
+11/01	Setting Orange, day 13 in the season of The Aftermath, 3172.
+11/02	Sweetmorn, day 14 in the season of The Aftermath, 3172.
+11/03	Boomtime, day 15 in the season of The Aftermath, 3172.
+11/04	Pungenday, day 16 in the season of The Aftermath, 3172.
+11/05	Prickle-Prickle, day 17 in the season of The Aftermath, 3172.
+11/06	Setting Orange, day 18 in the season of The Aftermath, 3172.
+11/07	Sweetmorn, day 19 in the season of The Aftermath, 3172.
+11/08	Boomtime, day 20 in the season of The Aftermath, 3172.
+11/09	Pungenday, day 21 in the season of The Aftermath, 3172.
+11/10	Prickle-Prickle, day 22 in the season of The Aftermath, 3172.
+11/11	Setting Orange, day 23 in the season of The Aftermath, 3172.
+11/12	Sweetmorn, day 24 in the season of The Aftermath, 3172.
+11/13	Boomtime, day 25 in the season of The Aftermath, 3172.
+11/14	Pungenday, day 26 in the season of The Aftermath, 3172.
+11/15	Prickle-Prickle, day 27 in the season of The Aftermath, 3172.
+11/16	Setting Orange, day 28 in the season of The Aftermath, 3172.
+11/17	Sweetmorn, day 29 in the season of The Aftermath, 3172.
+11/18	Boomtime, day 30 in the season of The Aftermath, 3172.
+11/19	Pungenday, day 31 in the season of The Aftermath, 3172.
+11/20	Prickle-Prickle, day 32 in the season of The Aftermath, 3172.
+11/21	Setting Orange, day 33 in the season of The Aftermath, 3172.
+11/22	Sweetmorn, day 34 in the season of The Aftermath, 3172.
+11/23	Boomtime, day 35 in the season of The Aftermath, 3172.
+11/24	Pungenday, day 36 in the season of The Aftermath, 3172.
+11/25	Prickle-Prickle, day 37 in the season of The Aftermath, 3172.
+11/26	Setting Orange, day 38 in the season of The Aftermath, 3172.
+11/27	Sweetmorn, day 39 in the season of The Aftermath, 3172.
+11/28	Boomtime, day 40 in the season of The Aftermath, 3172.
+11/29	Pungenday, day 41 in the season of The Aftermath, 3172.
+11/30	Prickle-Prickle, day 42 in the season of The Aftermath, 3172.
+12/01	Setting Orange, day 43 in the season of The Aftermath, 3172.
+12/02	Sweetmorn, day 44 in the season of The Aftermath, 3172.
+12/03	Boomtime, day 45 in the season of The Aftermath, 3172.
+12/04	Pungenday, day 46 in the season of The Aftermath, 3172.
+12/05	Prickle-Prickle, day 47 in the season of The Aftermath, 3172.
+12/06	Setting Orange, day 48 in the season of The Aftermath, 3172.
+12/07	Sweetmorn, day 49 in the season of The Aftermath, 3172.
+12/08	Boomtime, day 50 in the season of The Aftermath, 3172.
+	It is the sacred Season Holyday of Afflux.
+12/09	Pungenday, day 51 in the season of The Aftermath, 3172.
+12/10	Prickle-Prickle, day 52 in the season of The Aftermath, 3172.
+12/11	Setting Orange, day 53 in the season of The Aftermath, 3172.
+12/12	Sweetmorn, day 54 in the season of The Aftermath, 3172.
+12/13	Boomtime, day 55 in the season of The Aftermath, 3172.
+12/14	Pungenday, day 56 in the season of The Aftermath, 3172.
+12/15	Prickle-Prickle, day 57 in the season of The Aftermath, 3172.
+12/16	Setting Orange, day 58 in the season of The Aftermath, 3172.
+12/17	Sweetmorn, day 59 in the season of The Aftermath, 3172.
+12/18	Boomtime, day 60 in the season of The Aftermath, 3172.
+12/19	Pungenday, day 61 in the season of The Aftermath, 3172.
+12/20	Prickle-Prickle, day 62 in the season of The Aftermath, 3172.
+12/21	Setting Orange, day 63 in the season of The Aftermath, 3172.
+12/22	Sweetmorn, day 64 in the season of The Aftermath, 3172.
+12/23	Boomtime, day 65 in the season of The Aftermath, 3172.
+12/24	Pungenday, day 66 in the season of The Aftermath, 3172.
+12/25	Prickle-Prickle, day 67 in the season of The Aftermath, 3172.
+12/26	Setting Orange, day 68 in the season of The Aftermath, 3172.
+12/27	Sweetmorn, day 69 in the season of The Aftermath, 3172.
+12/28	Boomtime, day 70 in the season of The Aftermath, 3172.
+12/29	Pungenday, day 71 in the season of The Aftermath, 3172.
+12/30	Prickle-Prickle, day 72 in the season of The Aftermath, 3172.
+12/31	Setting Orange, day 73 in the season of The Aftermath, 3172.
+
+#endif /* !_calendar_discord_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.fictional b/src/usr.bin/calendar/calendars/calendar.fictional
new file mode 100644
index 0000000..5e28a3b
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.fictional
@@ -0,0 +1,57 @@
+/*
+ * Fictional events
+ *
+ * $OpenBSD: calendar.fictional,v 1.4 2007/06/10 17:34:04 simon Exp $
+ */
+
+#ifndef _calendar_fictional_
+#define _calendar_fictional_
+
+01/05	Fellowship enters Moria  (LOTR)
+01/09	Fellowship reaches Lorien (LOTR)
+01/17	Passing of Gandalf (LOTR)
+02/07	Fellowship leaves Lorien (LOTR)
+02/17	Death of Boromir (LOTR)
+02/20	Meriadoc & Pippin meet Treebeard (LOTR)
+02/22	Passing of King Ellesar (LOTR)
+02/24	Ents destroy Isengard (LOTR)
+02/26	Aragorn takes the Paths of the Dead (LOTR)
+03/05	Frodo & Samwise encounter Shelob (LOTR)
+03/08	Deaths of Denethor & Theoden (LOTR)
+03/18	Destruction of the Ring (LOTR)
+03/29	Flowering of the Mallorn (LOTR)
+04/04	Gandalf visits Bilbo (LOTR)
+04/17	An unexpected party (LOTR)
+04/23	Crowning of King Ellesar (LOTR)
+05/19	Arwen leaves Lorien to wed King Ellesar (LOTR)
+05/25	Towel Day (The Hitchhiker's Guide to the Galaxy) 
+06/11	Sauron attacks Osgilliath (LOTR)
+06/13	Bilbo returns to Bag End (LOTR)
+06/23	Wedding of Ellesar & Arwen (LOTR)
+07/04	Gandalf imprisoned by Saruman (LOTR)
+07/24	The ring comes to Bilbo (LOTR)
+07/26	Bilbo rescued from Wargs by Eagles (LOTR)
+08/03	Funeral of King Theoden (LOTR)
+08/29	Saruman enters the Shire (LOTR)
+09/10	Gandalf escapes from Orthanc (LOTR)
+09/14	Frodo & Bilbo's birthday (LOTR)
+09/15	Black riders enter the Shire (LOTR)
+09/18	Frodo and company rescued by Bombadil (LOTR)
+09/28	Frodo wounded at Weathertop (LOTR)
+10/05	Frodo crosses bridge of Mitheithel (LOTR)
+10/16	Boromir reaches Rivendell (LOTR)
+10/17	Council of Elrond (LOTR)
+10/25	End of War of the Ring (LOTR)
+11/16	Bilbo reaches the Lonely Mountain (LOTR)
+12/05	Death of Smaug (LOTR)
+12/16	Fellowship begins Quest (LOTR)
+12/21	Phileas Fogg completes his trip around the world in less than 80 days
+
+/* These really _did_ "happen" */
+05/23	Two Yetis sighted, Mt. Everest, 1953
+05/25	Oral Roberts sees 900 foot tall Jesus Christ, Tulsa OK, 1980
+/* Not really a fictional event, just a fictional time */
+05/08	Beginning of ostrich mating season
+10/23	Earth created at 6:30 AM, 4004BC.
+
+#endif /* !_calendar_fictional_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.french b/src/usr.bin/calendar/calendars/calendar.french
new file mode 100644
index 0000000..e3e3ce1
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.french
@@ -0,0 +1,12 @@
+/*
+ * French calendar file(s)
+ *
+ * $OpenBSD: calendar.french,v 1.2 2004/03/15 13:16:04 xsa Exp $
+ */
+
+#ifndef _calendar_french_
+#define _calendar_french_
+
+#include <fr_FR.ISO8859-1/calendar.all>
+
+#endif /* !_calendar_french_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.german b/src/usr.bin/calendar/calendars/calendar.german
new file mode 100644
index 0000000..45a03c1
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.german
@@ -0,0 +1,12 @@
+/*
+ * German calendar file(s)
+ *
+ * $OpenBSD: calendar.german,v 1.1 1996/12/05 06:04:46 millert Exp $
+ */
+
+#ifndef _calendar_german_
+#define _calendar_german_
+
+#include <de_DE.ISO_8859-1/calendar.all>
+
+#endif /* !_calendar_german_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.history b/src/usr.bin/calendar/calendars/calendar.history
new file mode 100644
index 0000000..fa40c09
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.history
@@ -0,0 +1,504 @@
+/*
+ * History
+ *
+ * $OpenBSD: calendar.history,v 1.76 2013/11/26 15:25:56 sobrado Exp $
+ */
+
+#ifndef _calendar_history_
+#define _calendar_history_
+
+01/01	Anniversary of the Triumph of the Revolution in Cuba
+01/01	Castro expels Cuban President Batista, 1959
+01/01	Churchill delivers his "Iron Curtain" speech, 1947
+01/02	Canada and the United States agree on a plan to preserve
+	Niagara Falls, 1929
+01/03	Benito Mussolini announces he is taking dictatorial powers
+	over Italy, 1925
+01/03	Margaret Thatcher becomes the longest-serving British
+	Prime Minister in the 20th Century, 1988
+01/04	Burma becomes independent from United Kingdom, 1948
+01/05	Twelfth night
+01/06	Maria Montessori opens her first school in Rome, 1907
+01/07	First transatlantic telephone call, 1927
+01/08	Monaco gains its independence, 1297
+01/09	Plough Monday
+01/10	First meeting of United Nations General Assembly in London, 1946
+01/10	Thomas Paine's Common Sense published, 1776
+01/11	Anniversary of the Peoples Republic of Albania
+01/11	De Hostos' Birthday in Puerto Rico
+01/11	Prithvi Jayanti in Nepal
+01/12	Batman the TV series debuts on ABC, 1966
+01/13	Mickey Mouse comic strip makes its first appearance, 1930
+01/14	Julian Calendar New Year's Day
+01/15	Angola becomes an independent state, 1975
+01/16	The Medici family are made official bankers of the Papacy, 1412
+01/17	Captain James Cook becomes the first explorer to cross the
+	Antarctic Circle, 1773
+01/18	The X-ray machine is exhibited for the first time, 1896
+01/19	The last Volkswagen Beetle made in Germany leaves VW's plant, 1978
+01/20	St. Agnes Eve (Ah, bitter chill it was...)
+01/21	First commercial flight with a Concorde, 1976
+01/22	British colonists reach New Zealand, 1840
+01/23	The Royal Exchange opens in London, 1571
+01/23	The Union of Utrecht forms a Protestant republic in
+	the Netherlands, 1579
+01/24	Robert Baden-Powell begins the Boy Scout movement, 1908
+01/25	The British Parliament passes the Constitutional Act of 1791 and splits
+	the old province of Quebec into Upper and Lower Canada, 1791
+01/26	Sydney Aust. settled, 1788
+01/27	Vietnam War cease-fire signed, 1973
+01/28	The first locomotive runs from the Atlantic to the Pacific on the
+	Panama Railway, 1855
+01/29	Liliuokalani is proclaimed Queen of Hawaii, the last monarch of
+	Hawaii, 1891
+01/30	Mohandas Gandhi assassinated in New Delhi by Hindu fanatic, 1948
+01/31	Irving Langmuir invented tungsten filament lamp, 1881
+01/31	Dmitry Mendeleev established optimal alcohol-water mixture ratio
+	in his PhD work on alcohol-water mixtures, 1865
+02/01	Forces led by Khomeini take over Iran, 1979
+02/02	Adolf Hitler dissolves the German Parliament, 1933
+02/03	The first commercial cheese factory is founded in Switzerland, 1815
+02/04	Cybernet inaugurated, 1969
+02/04	Patricia Hearst kidnaped by Symbionese Liberation Army, 1974
+02/05	Gamel Abdel Nasser is nominated to be the first president of
+	the United Arab Republic, 1958
+02/06	Signing of the Treaty of Waitangi, founding document of New Zealand, 1840
+02/07	The British Labour Party is formed, 1900
+02/08	1963 Revolution Anniversary in Iraq
+02/09	Gregory XV becomes Pope, the last Pope elected by acclamation, 1621
+02/10	New Delhi becomes the capital of India, 1931
+02/11	Norway's independence is proclaimed, marking the ultimate end of
+	the Kalmar Union, 1814
+02/12	China adopts the Gregorian calendar, 1912
+02/13	France tests its first atomic bomb in Algeria, 1960
+02/14	Bombing of Dresden, 1945
+02/15	Chicago Seven convicted, 1970
+02/16	Nylon patented, 1937
+02/17	The first ship passes through the Suez Canal, 1867
+02/18	Joseph Goebbels delivers the Sportpalast speech, 1943
+02/19	Serfdom is abolished in Russia, 1861
+02/20	FBI agent Robert Hanssen is arrested and charged with spying for Russia
+	for 15 years, 2001
+02/21	Battle of Verdun begins, 1916 1M casualties
+02/22	Start of the Czechoslovak Revolution, 1948
+02/23	Lt. Calley confesses, implicates Cpt. Medina, 1971
+02/24	Impeachment proceedings against Andrew Johnson begin, 1868
+02/25	The Democratic Republic of Georgia occupied by Bolshevist Russia, 1921
+02/26	Final radio broadcast of Dragnet, 1957
+02/27	The Lionheart crowned, 1189
+02/28	The "French Connection" drug bust occurs in Marseilles, 1972
+03/01	The city of Rio de Janeiro is founded, 1565
+03/02	Ho Chi Minh is elected the President of North Vietnam, 1946
+03/03	Bulgaria regains its independence from Ottoman Empire, 1878
+03/04	Emile Berliner invents the microphone, 1877
+03/05	Samuel Colt makes the first production-model revolver, 1836
+03/06	The aspirin is registered as a trademark of Bayer, 1899
+03/07	Mass protest outside the National Assembly of Kuwait building for
+	women's voting rights in Kuwait, 2005
+03/08	The first case of Spanish flu occurs, killing 50 million to 100 million
+	people worldwide, 1918
+03/09	The Barbie doll debuts, 1959
+03/10	Republic of Cote d'Ivoire becomes a colony of France, 1893
+03/11	Ceasefire declared in the war between Iran and Irak, 1988
+03/12	The first bottles of Coca Cola were sold, 1894
+03/13	"Striptease" introduced, Paris, 1894
+03/14	The kingdom of Cyprus is sold by the ruling Queen to Venice, 1489
+03/15	France assumes protectorate over Vietnam, 1874
+03/15	Julius Caesar, Dictator of the Roman Republic, is stabbed to death by
+	several senators, 44BC
+03/16	Largest coordinated worldwide vigil against the Iraq War, 2003
+03/17	Invention of the rubber band, 1845
+03/17	Ukrainian Nationalist Republic declared, 1917
+03/18	In the Pyramid of Cheops a 4.400 year old mummy is found, 1989
+03/19	Swallows return to Capistrano
+03/20	Radio Caroline, the original British pirate radio station, sinks, 1980
+03/21	Henry V becomes the king of England, 1413
+03/22	First motion picture displayed by Auguste and Louis Lumière, 1895
+03/22	World Day for Water
+03/23	The first Islamic republic in the world is Pakistan, 1956
+03/24	Construction of New York subway system begins, 1900
+03/25	The first Bed-In for Peace by John Lennon and Yoko Ono, 1969
+03/26	The driving test is introduced, in the United Kingdom, 1934
+03/27	Khrushchev becomes Premier of Soviet Union, 1958
+03/28	Three Mile Island releases radioactive gas, 1979
+03/29	The Republic of Ireland bans smoking in all work places, 2004
+03/30	Pencil with eraser patented, 1858
+03/31	The Eiffel Tower is inaugurated, 1889
+04/01	People of superb intelligence, savoir-faire, etc. born this day.
+04/02	Haile Selassie is proclaimed emperor of Ethiopia, 1930
+04/03	First publication of the newspaper La Gazzetta dello Sport, 1896
+04/04	NATO established, 1949
+04/05	Pocahontas marries English colonist John Rolfe in Virginia, 1614
+04/06	Joseph Smith founds Mormon Church, 1830
+04/07	Alewives run, Cape Cod
+04/08	The Venus de Milo is found on the island of Melos, 1820
+04/09	The first public exhibition of art opens in Paris, 1667
+04/10	The Belfast Agreement is signed, on Good Friday, 1998
+04/11	The Shogunate is abolished in Japan, 1868
+04/12	Great Britain adopts the Union Jack as their national flag, 1606
+04/13	Laotian New Year (3 days) in Laos
+04/14	Titanic hits iceberg and sinks, 1912
+04/15	Insulin first becomes generally available for use by diabetics, 1923
+04/16	Syria becomes an independent Republic, 1946
+04/17	Bay of Pigs invasion crushed by Castro forces, 1961
+04/18	The League of Nations is dissolved after 27 years, 1946
+04/19	Landing of the "33" in Uruguay
+04/19	Warsaw Ghetto uprising, 1943
+04/20	In Bulgaria, the April Uprising takes place, 1876
+04/21	Rome is founded by Romulus and Remus, 753BC
+04/22	Portuguese navigator Pedro Alvares Cabral becomes the first European to
+	sight Brazil, 1500
+04/22	The first Earth Day is celebrated, 1970
+04/23	Bavarian co-rulers Duke Wilhelm IV and Duke Ludwig X proclaimed the
+	weighty and consequential Bavarian Beer Purity Law
+	(later Reinheitsgebot), 1516
+04/24	The Greek enter Troy with the Trojan Horse, 1184BC
+04/25	Integrated circuit patented by Robert Noyce, 1961
+04/26	William Shakespeare baptized in Stratford-on-Avon, England, 1564,
+	birthdate less certain
+04/27	Magellan killed in Philippines, 1521
+04/28	President of France, Charles de Gaulle resigns, 1969
+04/29	Zipper patented by Gideon Sindback, 1913
+04/30	Adolf Hitler and Eva Braun commit suicide, 1945
+05/01	Beltaine; Feast of the god Bel, sun god
+05/01	Adam Weishaupt founded the Illuminati of Bavaria, 1776
+05/02	The first modern sighting of the Loch Ness monster is reported, 1933
+05/03	Jamaica is spotted by Christopher Columbus, 1494
+05/04	Christopher Columbus sets foot on Jamaica, 1494
+05/05	Kublai Khan becomes ruler of the Mongol Empire, 1260
+05/06	Hindenburg explodes and burns upon landing at Lakehurst, NJ, 1937
+05/07	Germany surrenders after World War II, 1945
+05/08	Herbert Akroyd Stuart patented the first "diesel" engine, 1890
+05/09	The first parliament of Australia opens in Melbourne, 1901
+05/10	Germany invades Low Countries, 1940
+05/10	Nazi bookburning, 1933
+05/11	Thailand is no longer known as Siam, 1949
+05/12	Tunisia becomes a French protectorate, 1881
+05/13	Dutch statesman Johan van Oldenbarnevelt is executed in The Hague after
+	having been accused of treason, 1619
+05/14	Beginning of Lewis and Clark Expedition, 1804
+05/14	Nation of Israel proclaimed, 1948
+05/15	The civil war in Finland ends, 1918
+05/16	Root beer invented by Charles Elmer Hires, 1866
+05/17	24" rain in 11 hours, Pearl River, S. China, 1982
+05/18	Battle of Las Piedras in Uruguay
+05/18	Napoleon crowned Emperor, 1804
+05/19	The Legion d'Honneur is founded by Napoleon Bonaparte, 1802
+05/20	The first modern atlas issued by Abraham Ortelius, 1570
+05/21	Battle of Iquique in Chile
+05/22	The transporting of British convicts to the New South Wales colony,
+	is abolished, 1840
+05/23	Israeli raid into Argentina to capture Adolf Eichmann, 1960
+05/24	Battle of Pinchincha in Ecuador
+05/25	Successful test of the limelight in Purfleet, England, 1830
+05/26	John Calvin and his followers are expelled from Geneva, 1538
+05/27	The pop-up toaster patented by Charles Strite, 1919
+05/28	Alan Turing submits On Computable Numbers for publication, 1936
+05/29	Edmund Hillary and Tenzing Norkay climb Mt. Everest, 1953
+05/29	First food stamps issued, 1961
+05/30	Beginning of the civil war over Biafra, 1967
+05/31	Yom Kippur War comes to an end by the signing of a disengagement
+	agreement by Syria and Israel, 1974
+06/01	In a referendum the Dutch reject the European Constitution, 2005
+06/02	Denmark rejects the Maastricht Treaty in a close-call referendum, 1992
+06/03	Last Star Trek episode first aired ("Turnabout Intruder"), 1969
+06/03	Edward White becomes the first American to perform a "Space Walk", 1965
+06/04	Roquefort cheese developed, 1070
+06/05	Titus and his Roman legions breach the middle wall of Jerusalem, 70
+06/06	First drive-in movie, 1933
+06/06	Normandy landing, 1944
+06/07	The first act of civil disobedience by Gandhi, 1893
+06/08	The Canadian Parliament meets for the first time in Ottawa, 1866
+06/09	The Roman Emperor Nero commits suicide, 68
+06/10	Death of Alexander the Great, 323 B.C.
+06/11	Greeks seize Troy, 1184BC
+06/12	Nelson Mandela is sentenced to life in prison, 1964
+06/13	Much of Vancouver, British Columbia, is devastated by a fire, 1886
+06/14	Sandpaper invented by I. Fischer, Jr., 1834
+06/15	Magna Carta signed, 1215
+06/15	Series of photographs by Edward Muggeridge prove to Leland Stanford
+	that all the hooves of a horse are off the ground during the gallop,
+	1878
+06/16	Henry Ford launched the Ford Motor Company, 1903
+06/17	China explodes its first Hydrogen bomb, 1967
+06/18	Winston Churchill delivers his "Finest Hour" speech, 1940
+06/19	Lizzie Borden acquitted, 1893
+06/19	Julius and Ethel Rosenberg are executed in Sing-Sing prison, 1953
+06/20	Victoria crowned, 1837
+06/21	Berlin airlift begins, 1948
+06/21	Sun rises over Heelstone at Stonehenge
+06/22	The June Days Uprising in Paris begins, 1848
+06/23	Slavery abolished in England, 1772
+06/23	Harriet, Darwin's turtle died at the age of 176 years, 2006
+06/24	The capital of Jamaica, Kingston, is founded, 1664
+06/25	Custer's Last Stand at Little Big Horn, 1876
+06/25	North Korea invades South Korea, 1950
+06/26	Toothbrush invented, 1498
+06/26	St. Lawrence Seaway dedicated by Eisenhower & Queen Elizabeth II, 1959
+06/27	The world's first ATM is installed in Enfield, London, 1967
+06/28	Archduke Franz Ferdinand of Austria assassinated in Sarajevo,
+	marking the beginning of World War I, 1914
+06/28	World War I ended with the signing of the Treaty of Versailles, 1919
+06/29	The Seychelles gains independence from the United Kingdom, 1976
+06/30	Albert Einstein published his theory of special relativity, 1905
+06/30	"That" explosion in Siberia at 7:17 local time, 1908
+06/30	China and Soviet Union announce split over ideology, 1960
+07/01	Warsaw Pact officially dissolved, 1991
+07/01	The first day on the Somme marked the beginning of the
+	Battle of the Somme, 1916
+07/01	Hong Kong becomes a special administrative region of the People's
+	Republic of China, 1997
+07/02	Vermont abolishes slavery, as the first state, 1777
+07/03	Dog days begin
+07/04	Thoreau enters woods, 1845
+07/05	Bikini demonstrated for the first time, 1946
+07/06	Lawrence of Arabia captures Aqaba, 1917
+07/07	First radio broadcast of "Dragnet", 1949
+07/08	A UFO is believed to have crashed near Roswell, New Mexico, 1947
+07/09	The African Union gets established, 2002
+07/10	Most of London gets burned down in a severe fire, 1212
+07/11	Mongolia gains independence from China, 1921
+07/12	Minimum wages established: 40 cents/hour, 1933
+07/13	Women first compete in Olympic games, 1908
+07/14	Storming of the Bastille by the citizens of Paris, 1789
+07/15	First item sold via Amazon.com, 1995
+07/16	End of the civil war in Rwanda, 1994
+07/17	Disneyland opens, 1955
+07/18	"Mein Kampf" is published, 1925
+07/19	France declares war on Prussia, marking the beginning of the
+	Franco-Prussian war, 1870
+07/20	Ford Motor Company ships their car, 1903
+07/21	Vietnam divided at 17th parallel, 1954
+07/22	Wiley Post becomes the first person to fly around the world, 1933
+07/23	Ice cream cone introduced, St. Louis MO, 1904
+07/24	Scopes Monkey Trial, 1925
+07/25	First test-tube baby born, 1978
+07/26	Potsdam Declaration signed, 1945
+07/27	The last Citroen 2CV made, 1990
+07/28	Potato introduced in Europe by Sir Thomas Harriot, 1586
+07/29	Inauguration of the Arc de Triomphe in Paris, 1836
+07/30	Elvis Presley performs for the first time in public, 1954
+07/31	First U.S. patent issued, 1790
+08/01	Lughnasa; Feast of the god Lugh, a 30 day Celtic feast centers on
+	this day
+08/02	Hitler becomes the Fuehrer of Germany, 1934
+08/03	Columbus sets sail for Cathay, 1492
+08/03	USS Nautilus crosses under north polar ice cap, 1958
+08/04	Axe murder of Andrew and Abbey Borden, 1892
+08/04	Bombing of N. Vietnam begins, 1964
+08/04	Britain declares war on Germany starting World War I, 1914
+08/05	Nelson Mandela is jailed, 1962
+08/06	Atomic bomb dropped on Hiroshima, 1945
+08/06	Caricom in Barbados
+08/07	Jack the Ripper makes his first kill, 1888
+08/08	Atomic bomb dropped on Nagasaki, 1945
+08/08	Montenegro declares war on Germany, 1914
+08/09	Persia defeats Spartan King Leonidas at Thermopylae, 480 BC
+08/10	Major terrorist plot to destroy aircraft disrupted by
+	Scotland Yard, 2006
+08/11	Dog days end
+08/11	France Ends War in Indochina, 1954
+08/12	Cleopatra commits suicide, 30BC
+08/13	Berlin wall erected, 1961
+08/13	Li'l Abner debut, 1934
+08/14	France introduces motor vehicle registration, 1893
+08/15	Gandhi's movement obtains independence for Pakistan and India, 1947
+08/16	Roller Coaster patented, 1898
+08/17	Indonesian Declaration of Independence, 1945
+08/18	Power blackout on Java, Indonesia, affects almost
+	100 million people, 2005
+08/19	Gail Borden patents condensed milk, 1856
+08/20	First commercial radio station airs in Detroit, Michigan, 1920
+08/21	Louvre employee steals the "Mona Lisa", 1911
+08/22	Death of King Richard III, 1485, Last of the Plantagenets
+08/22	Joe Walker sets X-15 all time altitude mark (67 miles), 1963
+08/22	St. Columbia reports seeing monster in Loch Ness, 565
+08/23	Sacco and Vanzetti executed, 1927
+08/24	-126.9 F at Vostok, Antarctica, 1960
+08/25	General de Gaulle leads French forces into Paris, 1944
+08/26	Women get the vote, 1920
+08/27	"Tarzan of the Apes" published, 1912
+08/27	Krakatoa, Java explodes with a force of 1,300 megatons, 1883
+08/28	Henry Hudson discovers Delaware Bay, 1609
+08/29	Michael Faraday discovers electromagnetic induction, 1831
+08/30	75 cents a pound tariff set on opium, 1842
+08/30	Japan Stationery Co. sells first felt-tipped pen, 1960
+08/30	St. Rose of Lima in Peru
+08/30	Washington-to-Moscow hot line connected, 1963
+08/31	269 people killed after Korean Airlines 747 shot down by USSR, 1983
+08/31	Mary Anne Nichols becomes Jack the Ripper's first victim, 1888
+08/31	Non-aggression pact signed by USSR and Afghanistan, 1926
+08/31	Independent union "Solidarnosc" born, Gdansk, 1980
+09/01	Bobby Fischer defeats Boris Spassky in World Chess Match, 1972
+09/02	Great Britain adopts Gregorian Calendar, 1752
+09/02	Japan signs unconditional surrender on US battleship `Missouri', 1945
+09/03	Anniversary of the Founding of the Republic in San Marino
+09/04	Napoleon III is deposed and the Third Republic is declared, 1870
+09/05	St. Gotthard Tunnel opens in Switzerland, 1980
+09/06	149 Pilgrims set forth from England aboard the Mayflower, 1620
+09/06	Somhlolo in Swaziland
+09/07	Brazil declares its independence from Portugal, 1822
+09/08	Jack the Ripper kills again, Annie Chapman is second victim, 1888
+09/09	John Herschel takes the first glass plate photograph, 1839
+09/10	Mountain Meadows Massacre.  Mormons kill Gentile wagon train, 1857
+09/11	World Wide Fund (WWF) founded, 1961
+09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
+09/12	Germany annexes Sudetenland, 1938
+09/13	136.4 F at el Azizia, Libya, 1922
+09/13	British defeat the French at Plains of Abraham near Quebec City, 1759
+09/13	Building of Hadrian's Wall begun, 122
+09/13	Chiang Kai-Shek becomes president of China, 1943
+09/14	The Selective Service Act establishes the first peacetime draft, 1940
+09/15	The Nazi's adopt a new national flag with the swastika, 1935
+09/16	General Motors is founded, 1908
+09/17	Joshua A. Norton proclaims himself 'Emperor Norton I', 1859
+09/17	Battle of Antietam, 1862
+09/18	Victory of Uprona in Burundi
+09/19	Walt Disney releases Steamboat Willie, 1928
+09/20	Magellan leaves Spain on the first Round the World passage, 1519
+09/21	J. R. R. Tolkien's The Hobbit is published, 1937
+09/22	Allied forces form the independent nation West Germany, 1953
+09/22	The first Soviet atomic bomb explodes, 1949
+09/23	Philippine President Ferdinand Marcos declares martial law, 1972
+09/24	The Netherlands surrenders New Amsterdam to England, 1664
+09/25	Battle of Stamford Bridge marks the end of the Viking era, 1066
+09/26	Concorde makes its first non-stop crossing of the Atlantic, 1973
+09/27	The first passenger was hauled in a locomotive in England, 1825
+09/28	"Pilgrim's Progress" published, 1678
+09/28	A Greek soldier runs 26+ miles after the Persian defeat at Marathon,
+	490BC
+09/30	Red Jack kills 2, Elizabeth Stride (#3) and Catherine Eddowes (#4),
+	1888
+09/30	The first tooth is extracted under anesthesia in Charleston, Mass, 1846
+09/30	The verdicts of the Nuremberg trials are announced, 1946
+10/01	Austria issues the world's first postcards, 1869
+10/02	Jacques Cartier discovers Montreal, Quebec, 1535
+10/03	O. J. Simpson is found not guilty of murder, 1995
+10/04	Crimean war begins, 1853
+10/05	Portugal declares itself a republic, 1910
+10/06	Antioch College is the first public school to admit men and women, 1853
+10/06	Egyptian President Anwar Sadat is assassinated in Cairo, 1981
+10/06	Israel is attacked by the alliance of Egypt and Syria, 1973
+10/07	Foundation of the GDR in 1949 in German Democratic Republic
+10/07	Mother Teresa of Calcutta awarded the Nobel Peace Prize, 1979
+10/07	Police stop Wilbur Mills car, Fanne Fox jumps into water, 1974
+10/08	San Marino adopts its written constitution, 1600
+10/09	First two-way telephone conversation, 1876
+10/10	Beginning of the Wars for Independence in Cuba
+10/10	Foundation of the Workers Party in North Korea
+10/11	The Gang of Four are arrested in Peking, 1976
+10/11	The second Vatican Ecumenical Council opens in Rome, 1962
+10/12	Bahama Natives discover Columbus of Europe lost on their shores, 1492
+10/12	Bavarian Crown Prince Ludwig married Princess Therese of
+	Saxony-Hildburghausen, Oktoberfest, 1810
+10/12	Khrushchev pounds his desk with shoe during a speech to the UN, 1960
+10/12	Man O'War's last race, 1920
+10/13	Italy declares war on Germany, 1943
+10/14	Battle of Hastings won by William the Conqueror and the Normans, 1066
+10/15	Edison Electric Light Company begins operation, 1878
+10/16	The Walt Disney Company is founded by Walt Disney
+	and his brother, Roy Disney, 1923
+10/17	Al Capone convicted of income tax evasion, 1931
+10/18	The Grand Ole Opry opens its doors, 1925
+10/19	Mao Tse-tung establishes the People's Republic of China, 1949
+10/19	Napoleon's beaten army begins the long retreat from Moscow, 1812
+10/20	"Saturday Night Massacre", 1973
+10/20	OPEC embargo, 1973
+10/21	Edison makes the first practical incandescent lamp, 1879
+10/21	Guggenheim Museum opens, 1959
+10/22	Laos gains independence from France, 1953
+10/23	Battle of Leyte Gulf begins, 1944
+10/23	Swallows leave Capistrano
+10/23	South African troops invade Angola in support of UNITA and FNLA, 1975
+10/24	Founding of the United Nations, 1945
+10/25	The UN removes Taiwan and admits the People's Republic of China, 1971
+10/26	UN's World Health Organization declares smallpox eradicated, 1978
+10/27	Stock markets around the world crash because of fears of
+	a global economic meltdown, 1997
+10/28	Columbus discovers Cuba, 1492
+10/28	Constantine's army defeats forces of Maxentius at Mulvian Bridge, 312
+10/29	Leibniz makes the first use of the "long s" for integral, 1675
+10/30	Communist Party of Australia founded in Sydney, 1920
+10/31	Luther nails 95 Theses to door of Castle Church, Wittenberg, 1517
+11/01	Austria-Hungary become two separate nations, 1918
+11/01	Puerto Rican nationalists try to kill Truman at the Blair House, 1950
+11/02	Luftwaffe completes 57 consecutive nights of bombing of London, 1940
+11/02	Two Frenchmen make the first free hot air balloon flight, 1783
+11/03	Linus Pauling wins Nobel Chemistry Prize, 1954
+11/04	Soviet forces crush the anti-communist revolt in Hungary, 1956
+11/05	Guy Fawkes' Plot, 1605
+11/06	Anniversary of the October Socialist Revolution (2 days) in U.S.S.R.
+11/07	Abolitionist newspaperman Elijah P. Lovejoy murdered by mob, 1837
+11/07	Lewis and Clark Expedition in sight of the Pacific Ocean, 1805
+11/08	Invasion of Sweden by Danish forces results in the
+	Stockholm Bloodbath, 1520
+11/09	Giant panda discovered (?!), China, 1927
+11/09	Jack the Ripper kills fifth and final victim, Jane Kelly, 1888
+11/10	Henry Stanley asks David Livingstone, "Dr. Livingstone, I presume?",
+	1871
+11/11	First broadcast of Sesame Street, 1970
+11/12	Dr. Sun Yat-sen's Birthday in Taiwan
+11/13	St. Brice's Day massacre by order of Ethelred, king of England, 1002
+11/14	Czechoslovakia becomes a republic, 1918
+11/15	First assembly of the League of Nations is held in Geneva, 1920
+11/16	Opening of the Suez Canal, 1869
+11/16	Albert Hofmann synthesizes LSD in Switzerland, 1938
+11/17	Elizabeth I of England succeeds Queen Mary I of England, 1558
+11/18	First hydrogen bomb blasts Enewetok, 1952
+11/19	Samuel Goldwyn and Edgar Selwyn establish Goldwyn Company, 1916
+11/20	Nuremberg Trials against 24 Nazi war criminals begin, 1945
+11/21	Birmingham Pub Bombings by the IRA kill 21 people, 1974
+11/22	John F. Kennedy is assassinated in Dallas, Texas, 1963
+11/23	The first edition of Life is published. 1936
+11/24	Alleged assassin Lee Harvey Oswald is killed by 
+	Jack Ruby in Dallas, Texas, 1963
+11/25	Alfred Nobel invents dynamite, 1867
+11/26	Last flight ever with a Concorde made over Bristol, UK, 2003
+11/27	Alfred Nobel establishes Nobel Prize, 1895
+11/27	Friction match invented by englishman John Walker, Sweden, 1826
+11/28	Albania declares its independence from the Ottoman Empire, 1912
+11/29	King Tut's tomb opened, 1922
+12/01	Ford Motor Company introduces the first moving assembly line, 1913
+12/02	Napoleon III becomes Emperor of the French, 1852
+12/03	First neon light display, Paris, 1910
+12/03	First successful human heart transplant led by Dr. Barnard, 1967
+12/03	The Montreux Casino burns down during a Frank Zappa concert, 1971
+12/04	People's Republic of China adopts its current constitution, 1982
+12/05	Phi Beta Kappa founded, 1776
+12/06	London becomes the world's first city with motorised cabs, 1897
+12/07	Japan bombs Pearl Harbor, 1941
+12/08	Romanian Constitution is adopted in a referendum, 1991
+12/09	Ball-bearing roller skates patented, 1884
+12/10	Metric system established in France, 1799
+12/10	Nobel Peace Prize awarded each year
+12/11	The British Parliament enacts the Statute of Westminster, 1931
+12/12	First wireless message sent across Atlantic by Marconi, 1901
+12/13	Dartmouth College chartered, 1769
+12/14	Portugal joins the United Nations, 1955
+12/15	Argo Merchant oil spill, 1976
+12/15	James Naismith invents basketball, Canada, 1891
+12/16	Pokemon episode (Electric Soldier Porygon) triggers attacks of
+	photosensitive epilepsy in hundreds of Japanese children, 1997
+12/17	Charles Dickens' A Christmas Carol is first published, 1843
+12/18	Indonesia invades Netherlands New Guinea, 1961
+12/19	Hitler becomes Supreme Commander-in-Chief of the
+	German Army, 1941
+12/20	Cheka founded, 1917
+12/21	Charles de Gaulle is elected President of France, 1958
+12/22	First freight train is operated in Roorkee in India, 1851
+12/23	The transistor is first demonstrated at Bell Laboratories, 1947
+12/24	Hong Kong falls to the Japanese Imperial Army, 1941
+12/25	Christian holiday Christmas Day celebrated
+12/25	Christmas Island founded and named by Captain William Mynors, 1643
+12/26	DPMA founded, 1951
+12/27	Ether first used as anesthetic in childbirth, 1845
+12/28	Spain recognizes independence of Mexico, 1836
+12/29	Battle of Wounded knee, 1890
+12/29	Edison receives patent for Radio, 1891
+12/30	Soviet Ukrainian Republic declared, 1917
+12/30	Israel and the Vatican establish diplomatic relations, 1993
+12/31	St. Sylvester in Switzerland
+12/31	Windows tax in England, 1695
+12/31	First supersonic commercial flight by Tu-144, 1968
+
+#endif /* !_calendar_history_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.holiday b/src/usr.bin/calendar/calendars/calendar.holiday
new file mode 100644
index 0000000..952bdc7
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.holiday
@@ -0,0 +1,582 @@
+/*
+ * Holiday
+ *
+ * $OpenBSD: calendar.holiday,v 1.25 2013/11/26 15:25:56 sobrado Exp $
+ */
+
+#ifndef _calendar_holiday_
+#define _calendar_holiday_
+
+01/01	Independence Day in Haiti, Sudan
+01/01	Universal Fraternity Day in Mozambique
+01/02	Ancestry Day in Haiti
+01/02	St. Berchtold's Day in Switzerland
+01/03	New Year's Holiday in Scotland
+01/03	Revolution Day in Upper Volta
+01/04	Independence Day in Burma
+01/04	Martyrs Day in Zaire
+01/06	Children's Day in Uruguay
+01/06	Three Kings' Day in Puerto Rico
+01/07	Christmas in Ethiopia
+01/07	Pioneer's Day in Liberia
+01/09	Day of the Martyrs in Panama
+01/11	Armed Forces Day in Liberia
+01/12	Zanzibar Revolution Day in Tanzania
+01/13	National Liberation Day in Togo
+01/SunSecond	Coming-of-Age Day
+01/15	Arbor Day in Jordan
+01/16	Martyrs Day in Benin
+01/18	Revolution Day in Tunisia
+01/19	Confederate Heroes Day in Texas
+01/19	Ethopian Epiphany in Ethiopia
+01/19	Nameday of Archbishop Makarios in Cyprus
+01/20	Army Day in Mali
+01/20	National Heroes Day in Guinea-Bissau
+01/SunThird	Martin Luther King Day in New York (3rd Sunday)
+01/MonThird	Robert E. Lee's Birthday in Alabama & Mississippi (3rd Monday)
+01/MonThird	Lee-Jackson Day in Virginia (3rd Monday)
+01/21	Our Lady of Altagracia in Dominican Republic
+01/23	Feast of St. Ildefonsus
+01/23	National Handwriting Day
+01/24	Economic Liberation Day in Togo
+01/26	Republic Day in India
+01/30	Australia Day in Australia
+02/01	Chinese New Year Holiday (3 days) in Taiwan
+02/02	Candlemas
+02/04	Independence Commemoration Day in Sri Lanka
+02/05	Constitution Day in Mexico
+02/06	New Zealand Day
+02/07	Independence Day in Grenada
+02/08	Preseren Day (Cultural Holiday) in Slovenia
+02/09	St. Maron's Day in Lebanon
+02/10	Feast of St. Paul's Shipwreck, AD 60
+02/11	National Foundation Day in Japan
+02/12	Pyidaungsa Day in Burma
+02/16	Makha Bucha Day in Thailand
+02/18	Democracy Day in Nepal
+02/18	Independence Day in The Gambia
+02/23	Republic Day in Guyana
+02/24	Gregorian Calendar Day
+02/25	National Day in Kuwait
+02/27	Independence Day in Dominican Republic
+03/01	Samil Independence Movement Day in South Korea
+03/01	St. David's Day, Cardiff
+03/02	Peasants Day in Burma
+03/02	Texas Independence day
+03/02	Victory of Adowa in Ethiopia
+03/03	Girl's Day in Japan
+03/03	Throne Day in Morocco
+03/04	Vermont Admission Day (admitted as 14th state in 1791)
+03/05	Independence Day in Equatorial Guinea
+03/06	Lantern Day, Bejing
+03/07*	Purim - Feast of Lots
+03/08	First Annual International Women's Day, 1909
+03/08	International Women's Day in U.S.S.R.
+03/08	Syrian National Day in Libyan Arab Republic
+03/08	Women's Day in Guinea-Bissau, Taiwan, Republic of Yemen
+03/08	Youth Day in Zambia
+03/09	Decoration Day in Liberia
+03/09	Falgun Purnima Day in Nepal
+03/10	Labor Day in South Korea
+03/11	Johnny Appleseed Day; anniversary of the death of John Chapman
+03/12	Commonwealth Day in Swaziland
+03/12	Independence Day in Mauritius
+03/12	Moshoeshoe's Birthday in Lesotho
+03/12	Renovation Day in Gabon
+03/13	National Day in Grenada
+03/15	Day of the 1848 revolution in Hungary
+03/16	Black Press Day; first Black newspaper founded in 1827
+03/17	Evacuation Day in Suffolk County, Massachusetts
+03/17	St. Patrick's Day
+03/19	St. Joseph's Day in Colombia, Costa Rica, Holy See, Liechtenstein,
+	Bavaria, San Marino, Spain, Venezuela
+03/19	Tree Planting Day in Lestho
+03/20	Independence Day in Tunsia
+03/20	Youth Day in Oklahoma
+03/21	Afghan New Year in Afghanistan
+03/21	Juarez' Birthday in Mexico
+03/22	Abolition Day in Puerto Rico
+03/23	Pakistan Day in Pakistan
+03/25	Greek Independence Day in Cyprus
+03/25	Lady Day (a.k.a. the Feast of the Annunciation)
+03/25	Maryland Day in Maryland
+03/25	National Holiday in Greece
+03/MonLast	Seward's Day in Alaska (last Monday)
+03/26	Independence Day in Bangladesh
+03/26	Prince Jonah Kuhio Kalanianaole Day in Hawaii
+03/27	Armed Forces Day in Burma
+03/29	Death of President Barthelemy Boganda in Central African Republic
+03/29	Memorial Day in Madagascar
+03/31	National Day in Malta
+04/01	Youth Day in Benin
+04/02	Malvinas Day in Argentina
+04/02	Pascua Florida Day in Florida
+04/04	Ching Ming Festival in Hong Kong
+04/04	Liberation Day in Hungary
+04/04	National Day in Senegal
+04/05	Arbor Day in South Korea
+04/05	Tomb Sweeping Day in Taiwan
+04/06	Chakri Memorial Day in Thailand
+04/06	Victory Day in Ethiopia
+04/08	Fast and Prayer Day in Liberia
+04/09	Martyrs Day in Tunisia
+04/11	National Heroes Day in Costa Rica
+04/13	National Day in Chad
+04/13	Songkran Day in Thailand
+04/14	Day of the Americas in Honduras
+04/15	Bengali New Year in Bangladesh
+04/MonThird	Patriot's Day in Maine & Massachusetts (3rd Monday)
+04/16	De Diego's Birthday (celebrated in Puerto Rico)
+04/16	Holy Week (5 days) in Venezuela
+04/16	Tourist Week (5 days) in Uruguay
+04/17	Burmese New Year in Burma
+04/18	Independence Day in Chile, Zimbabwe
+04/19	Declaration of Independence in Venezuela
+04/19	Republic Day in Sierra Leone
+04/21	San Jacinto Day in Texas
+04/22	Arbor Day in Nebraska & Delaware
+04/22	Oklahoma Day in Oklahoma
+04/24	Victory Day in Togo
+04/24*	Pesach - First Day of Passover - Festival of Freedom
+04/25	Anzac Day in Australia, New Zealand, Tonga, Western Samoa
+04/25	Liberation Day in Italy
+04/25	National Flag Day in Swaziland
+04/26	Confederate Memorial Day in Florida & Georgia
+04/26	Union Day in Tanzania
+04/27	Day of Uprising Against Occupation in Slovenia
+04/27	Independence Day in Togo
+04/MonLast	Arbor Day in Wyoming (last Monday)
+04/MonLast	Confederate Memorial Day in Alabama & Mississippi (last Monday)
+04/30	The Workers Day in Uruguay
+05/01	Labor Day in many places
+05/01	Law Day (decl. by Eisenhower)
+05/01	May Day in many places
+05/02	Constitution Day in Japan
+05/03	Constitution Day in Poland
+05/04	Rhode Island Independence Day
+05/05	Children's Day in Japan, South Korea
+05/05	Coronation Day in Thailand
+05/05	Liberation Day in Netherlands
+05/06	Bataan Day in Philippines
+05/06*	Bank Holiday in UK
+05/07	May Day in United Kingdom
+05/08	Truman Day in Missouri
+05/09	Liberation Day in Czechoslovakia
+05/09	Victory Day in U.S.S.R.
+05/10	Confederate Memorial Day in South Carolina
+05/10	Mothers Day in Guatemala
+05/11	Minnesota Day in Minnesota
+05/14	Buddhist Holiday (Waisak 2528) in Indonesia
+05/14	Independence Day (2 days) in Paraguay
+05/14	Unification Day in Liberia
+05/15	Kamuzu Day in Malawi
+05/15	Vesak Day in Singapore, Malaysia
+05/15	Visakha Bucha Day in Thailand
+05/16	Discovery Day in Cayman Islands
+05/17	Constitution Day in Nauru, Norway
+05/18	Flag Day in Haiti
+05/18	Prayer Day in Denmark
+05/19	Youth and Sports Day in Turkey
+05/MonThird	Memorial Day in Michigan (3rd Monday)
+05/20	Mecklenburg Independence Day in North Carolina
+05/20	National Day in Cameroon
+05/Mon-2	Victoria Day in Canada
+05/22	National Heroes Day in Sri Lanka
+05/22	Declaration of the Republic of Yemen, 1990
+05/23	Commonwealth Day in Jamaica, Belize
+05/23	National Labor Day in Jamaica
+05/24	Bermuda Day in Bermuda
+05/24	Day of Slav Letters in Bulgaria
+05/25	African Freedom Day in Zimbabwe
+05/25	African Liberation Day in Chad, Mauritania, Zambia
+05/25	Independence Day in Jordan
+05/25	Memorial Day in New Mexico & Puerto Rico
+05/26*	First Day of Shavuot
+05/27*	Bank Holiday in UK
+05/28	Mothers Day in Central African Republic
+05/31	Pya Martyrs Day in Togo
+05/31	Republic Day in South Africa
+06/01	Independence Days (3 days) in Western Samoa
+06/01	Madaraka Day in Kenya
+06/01	Victory Day in Tunisia
+06/03	Confederate Memorial Day in Kentucky & Louisiana
+06/03	Labor Day in Bahamas
+06/03*	Bank Holiday in Rep. of Ireland
+06/04	Emancipation Day in Tonga
+06/05	Constitution Day in Denmark
+06/05	Liberation Day in Seychelles
+06/06	Memorial Day in South Korea
+06/06	National Day in Sweden
+06/09	Senior Citizen's Day in Oklahoma
+06/10	Camoes Day in Portugal
+06/11	King Kamehameha I Day in Hawaii
+06/12	Independence Day in Philippines
+06/14	Flag Day
+06/17	Bunker Hill Day in Suffolk County, Massachusetts
+06/17	Independence Day in Iceland
+06/17	National Day in Federal Republic of Germany
+06/18	Evacuation Day in Egypt
+06/19	Emancipation Day in Texas
+06/19	Labor Day in Trinidad, Tobago
+06/19	Revolution Day in Algeria
+06/20	Flag Day in Argentina
+06/20	West Virginia Day in West Virginia
+06/22	National Sovereignty Day in Haiti
+06/23	National Holiday in Luxembourg
+06/24	Fisherman's Day in Madagascar, Mozambique, Somalia
+06/24	Kings Day in Spain
+06/24	Peasants Day in Peru
+06/24	St. Jean-Baptiste Day in Quebec
+06/25	National Day in Slovenia
+06/28	Mothers Day in Central African Republic
+06/29	Independence Day in Seychelles
+06/29	Last Day of Ramadan* in Algeria, Oman
+06/30	Day of the Army in Guatemala
+07/01	Canada Day in Canada (previously Dominion Day)
+07/01	Freedom Day in Suriname
+07/01	Independence Day in Burundi
+07/01	National Day in Rwamda
+07/01	Republic Day in Ghana
+07/02	National Day in Kiribati
+07/04	Caribbean Day in Guyana
+07/04	Constitution Day in Cayman Islands
+07/04	Family Day in Lesotho
+07/04	Heroes Day in Zambia
+07/04	Kadooment Day in Barbados
+07/04	Philippine-American Friendship Day in the Philippines
+07/05	Day of Peace and Unity in Rwanda
+07/05	Independence Day in Algeria, Venezuela
+07/07	National Day in Malawi
+07/07	Saba Saba Day in Tanzania
+07/09	Independence Day in Argentina
+07/10	Independence Day in Bahamas
+07/11	National Holiday in the Mongolian People's Republic
+07/14	Bastille Day
+07/14	National Holiday in Monaco
+07/15	St. Swithin's Day
+07/16	Presidents Day in Botswana
+07/17	Constitution Day in South Korea
+07/17	Public Holiday in Botswana
+07/18	Constitution Day in Uruguay
+07/18	Liberation Day in Nicaragua
+07/19	Martyrs Day in Burma
+07/20	Independence Day in Colombia
+07/21	National Holiday in Belgium
+07/23	Egyptian National Day in Syrian Arab Republic
+07/23	Remembrance Day in Papua, New Guinea
+07/24	Pioneer Day in Utah
+07/24	Simon Bolivar's Day in Ecuador, Venezuela
+07/25	Constitution Day in Puerto Rico
+07/25	National Rebellion Day (3 days) in Cuba
+07/25	Republic Day in Tunisia
+07/26	Independence Day in Liberia
+07/26	National Day in Maldives
+07/28	Independence Days (2 days) in Peru
+07/29	Rain Day in Waynesburg, PA
+07/31	Revolution Day in Congo
+08/01	Discovery Day in Trinidad, Tobogo
+08/01	Emancipation Day in Granada
+08/01	Freedom Day in Guyana
+08/01	National Day in Switzerland
+08/01	National Holidays (5 days) in El Salvador
+08/01	Parent's Day in Zaire
+08/03	Independence Day in Jamaica, Niger
+08/03	Memorial Day of Archbishop Makarios in Cyprus
+08/04	Freedom Day in Guyana
+08/05*	Bank Holiday in Scotland and Northern Ireland
+08/06	Bank Holiday in Australia, British Columbia, Fiji, Iceland, Ireland,
+	Ontario
+08/06	Emancipation Day in Bahamas
+08/06	Independence Day in Bolivia
+08/09	National Day in Singapore
+08/10	Independence Day in Ecuador
+08/11	Heroes Day (2 days) in Zimbabwe
+08/11	Independence Day in Chad
+08/13	Women's Day in Tunisia
+08/14	Independence Day in Pakistan
+08/14	VJ Day, 1945
+08/15	Independence Day in India
+08/15	Liberation Day in South Korea
+08/15	National Day in Congo
+08/FriThird	Admission Day in Hawaii, 1984 (3rd Friday)
+08/16	Bennington Battle Day in Vermont
+08/16	Independence Days (3 days) in Gabon
+08/16	Restoration Day in Dominican Republic
+08/17	Independence Day in Indonesia
+08/19	Independence Day in Afghanistan
+08/20	Constitution Day in Hungary and birthday of King St. Istvan
+08/24	National Flag Day in Liberia
+08/25	Constitution Day in Paraguay
+08/25	Independence Day in Uruguay
+08/26	Susan B. Anthony Day in Massachusetts
+08/26*	Bank Holiday in England and Wales
+08/27	Liberation Day in Hong Kong
+08/28	Heroes Day in Philippines
+08/30	Huey P. Long Day in Louisiana
+08/30	Victory Day in Turkey
+08/31	Independence Day in Trinidad, Tobago
+08/31	National Day in Malaysia
+08/31	Pashtoonian Day in Afghanistan
+09/01	Army Day in Chile
+09/03	Independence Day in Qatar
+09/03	Memorial Day in Tunisia
+09/06	Defense of Pakistan Day in Pakistan
+09/06	Settlers Day in South Africa
+09/07	Independence Day in Brazil
+09/09	Admission Day in California
+09/09	National Day in North Korea
+09/10	Korean Thanksgiving Day (Chusuk) in South Korea
+09/10	National Day in Belize
+09/11	National Holiday in Chile
+09/12	Defender's Day in Maryland
+09/12	Revolution Day in Ethiopia
+09/13	Barry Day commemorates the death of Commodore John Barry
+09/15	Respect for the Aged Day in Japan
+09/16	Cherokee Strip Day in Oklahoma
+09/16	Independence Day in Mexico, Papua, New Guinea
+09/17	National Heroes Day in Angola
+09/18	Independence Day in Chile, Zimbabwe
+09/19	Army Day in Chile
+09/21	Independence Day in Belize
+09/22	Independence Day in Mali
+09/22	National Sovereignty Day in Haiti
+09/24	Independence Day in Guinea-Bissau
+09/24	National Day in Saudi Arabia
+09/24	Republic Day in Trinidad, Tobago
+09/25	Army Day in Mozambique
+09/25	Referendum Day in Rwanda
+09/26	National Day in Maldives, People's Democratic Yemen Republic
+09/26	Revolution Anniversary Day in Yemen Arab Republic
+09/28	Confucius' Day in Taiwan
+09/30	Botswana Day in Botswana
+09/30	First Day of Sukkot
+10/01	Armed Forces Day in South Korea
+10/01	Independence Day in Nigeria
+10/01	Labor Day in Australia
+10/01	National Liberation Day (2 days) in China
+10/01	Public Holiday in Botswana
+10/03	National Foundation Day in South Korea
+10/03	U.N. Day in Barbados
+10/03	German Reunification Day in Germany
+10/04	Independence Day in Lesotho
+10/06	National Sports Day in Lesotho
+10/07	National Heroes Day in Jamaica
+10/08	Constitution Day in U.S.S.R
+10/09	Independence Day in Uganda
+10/09	Korean Alphabet Day in South Korea
+10/09	Leif Erikson Day commemorates the discovery of North America in AD 1000
+10/09	Republic Day in Khmer Republic
+10/MonSecond	Fiji Day in Fiji
+10/MonSecond	Health-Sports Day in Japan
+10/MonSecond	Thanksgiving Day in Canada
+10/10	National Day in Taiwan
+10/10	Oklahoma Historical Day in Oklahoma
+10/11	Day of the Revolution in Panama
+10/11	Druger Day in South Africa
+10/12	Day of the Race in Argentina
+10/12	Discovery Day in Gahamas
+10/12	National Day in Equatorial Guinea, Spain
+10/12	Our Lady Aparecida Day in Brazil
+10/12	Pan American Day in Belize
+10/13	St. Edward's Day - Patron saint of England
+10/14	National Day in Yemen Arab Republic
+10/14	Young People's Day in Zaire
+10/15	Evacuation Day in Tunisia
+10/16	National Boss Day
+10/17	Heroes Day in Jamaica
+10/17	Mother's Day in Malawi
+10/20	Kenyatta Day in Kenya
+10/21	Armed Forces Day in Honduras
+10/21	Revolution Days (2 days) in Somalia
+10/23	Chulalongkron's Day in Thailand
+10/24	Independence Day in Zambia
+10/24	United Nations Day
+10/25	Labor Day in New Zealand
+10/25	Taiwan Restoration Day in Taiwan
+10/26	Agam Day in Nauru
+10/26	Armed Forces Day in Benin, Rwanda
+10/26	National Day in Austria
+10/28	National Holiday in Greece
+10/28	OHI Day in Cyprus
+10/28*	Bank Holiday in Rep. of Ireland
+10/29	Republic Day in Turkey
+10/31	Nevada Day in Nevada
+11/01	All Saints Day
+11/02	All Souls Day in Bolivia, Brazil, El Salvador, Uruguay
+11/02	Memorial Day in Ecuador
+11/03	Culture Day in Japan
+11/03	Thanksgiving Day in Liberia
+11/04	Flag Day in Panama
+11/04	Will Rogers Day
+11/06	Green March Day in Morocco
+11/07	National Revolution Day
+11/07	October Revolution Day in Hungary
+11/11	Remembrance Day in Canada
+11/11	Republic Day in Maldives
+11/11	Independence Day in Poland
+11/15	Dynasty Day in Belgium
+11/17	Army Day in Zaire
+11/18	Independence Day in Morocco
+11/18	National Days (4 days) in Oman
+11/19	Discovery Day in Puerto Rico
+11/19	Feast Day of S.A.S. Prince Rainier in Monaco
+11/20	Revolution Day in Mexico
+11/21	Day of Prayer and Repentance in Federal Republic of Germany
+11/22	Independence Day in Lebanon
+11/23	Labor Thanksgiving Day in Japan
+11/23	Rudolf Maister Day in Slovenia
+11/25	Independence Day in Suriname
+11/28	Independence Day in Albania, Mauritania
+11/29	Goodwill Day in Liberia
+11/29	Liberation Day in Albania
+11/29	National Day in Burma
+11/30	Independence Day in Barbados, People's Democratic Yemen Republic
+11/30	National Day in Benin
+11/30	National Heroes Day in Philippines
+11/30	St. Andrew's Day
+12/01	Independence Day in Central African Republic
+12/01	World AIDS Day
+12/01	National Day in Romania
+12/02	National Holiday in United Arab Emirates
+12/03	National Holiday in Laos
+12/06	Independence Day in Finland
+12/07	Delaware Day in Delaware
+12/07	Independence Day in Ivory Coast, Panama
+12/08	Mother's Day in Panama
+12/09	Independence Day in Tanzania
+12/10	Human Rights Day
+12/10	Thai Constitution Day in Thailand
+12/10	Wyoming Day in Wyoming
+12/11	Independence Day in Upper Volta
+12/12	Independence Day in Kenya
+12/13	Republic Day in Malta
+12/15	Statue Day in Netherlands Antilles
+12/16	Constitution Day in Nepal
+12/16	Day of the Covenant in South Africa
+12/16	National Day in Bahrain
+12/16	Victory Day in Bangladesh
+12/17	National Day in Bhutan
+12/18	Republic Day in Niger
+12/23	Victory Day in Egypt
+12/25	Children's Day in Congo
+12/26	Boxing Day
+12/26	Family Day in South Africa
+12/26	St. Stephen's Day
+12/26	Bank Holiday in Canada, Rep. of Ireland, and UK
+12/26	Independence and Unity Day in Slovenia
+12/27	Bank Holiday in Cayman Islands
+12/27	Constitution Day in North Korea
+12/27	Public Holiday in Lesotho, Zimbabwe
+12/29	Civic Holidays (3 days) in Costa Rica
+12/31	Bank Holiday in El Salvador, Honduras, Pakistan
+12/31	Feed Yourself Day in Benin
+
+04/21	Tiradentes in Brazil
+04/25	Anniversary of the Revolution in Portugal
+04/29	Greenary day in Japan
+04/30	Queen's Birthday in Netherlands, Netherlands Antilles
+05/01	Boy's day in Japan
+05/02	King's Birthday in Lesotho
+05/05	Battle of Puebla in Mexico
+05/08	Buddha's Birthday in South Korea
+05/08	Elections for the National Assembly in Philippines
+05/14	Anniversary of the Founding of Guinean Democratic Party in Guinea
+
+05/25	Anniversary of the Revolution of 1810 in Argentina
+05/25	Revolution in the Sudan in Libyan Arab Republic
+05/27	Afghanistan attains sovereignty, 1921
+06/02	Corpus Christi in Paraguay
+06/MonFirst	Jefferson Davis's Birthday in Alabama & Mississippi (1st Monday)
+06/MonFirst	Jefferson Davis's Birthday in Florida, Georgia, & S. Carolina
+06/04	Queen's Birthday in New Zealand
+06/06	His Majesty, Yang Di-Pertuan Agong's Birthday in Malaysia
+06/11	Queen's Birthday
+06/12	Peace with Bolivia in Paraguay
+06/13	Corrective Movement in Yemen Arab Republic
+06/16	Bloomsday - Anniversary of Dublin events, 1904, in "Ulysses"
+06/18	Queen's Birthday in Fiji
+06/19	Artigas Birthday in Uruguay
+06/22	Corrective Movement in the People's Democratic Yemen Republic
+06/22	Midsummer Eve in Finland, Sweden
+06/24	Battle of Carabobob in Venezuela
+07/01	Eid-Ul-Fitr* (2 days) in Pakistan
+07/01	Union of the Somalia Republic in Somalia
+07/07	Anniversary of the P.U.N. in Equatorial Guinea
+07/12	Battle of Boyne celebrated in Northern Ireland
+07/12	The Twelfth in Northern Ireland
+07/13	Buddhist Lent in Thailand
+07/14	Anniversary of the Revolution in Iraq
+07/17	July Revolution in Iraq
+07/17	Munoz Rivera's Birthday (celebrated in Puerto Rico)
+07/22	King's Birthday in Swaziland
+07/23	Anniversary of the Revolution in Egypt
+07/25	St. James, Patron Saint in Spain
+07/27	Barbosa's Birthday (celebrated in Puerto Rico)
+07/29	Olsok Eve in Norway to commemorate Norway's Viking King St. Olav
+08/01	Founding of Asuncion in Paraguay
+08/02	Our Lady of Los Angeles in Costa Rica
+08/03	Massacre du Pidjiguiti in Guinea-Bissau
+08/07	Battle of Boyaca in Colombia
+08/11	King Hussein's Accession to the Throne in Jordan
+08/12	Queen's Birthday in Thailand
+08/13	Proclamation of Independence in Central African Republic
+08/14	Waddi Dhahab in Morocco
+08/15	Founding of Ascuncion in Paraguay
+08/15	Santa Maria in Malta
+08/17	Anniversary of the Death of General San Martin in Argentina
+09/09	Anniversary of the Socialist Revolution (2 days) in Bulgaria
+09/10	Moon Festival in Taiwan
+09/11	Anniversary of military coup in Chile
+09/11	Ethiopian New Year in Ethiopia
+09/12	Amilcar Cabral's Birthday in Guinea-Bissau
+09/14	Battle of San Jacinto in Nicaragua
+09/15	Foundation of Panama in Panama
+09/23	Grito de Lares in Puerto Rico
+09/24	Anniversary of the Third Republic in Ghana
+09/24	Our Lady of Mercedes in Dominican Republic
+09/27	Feast of Finding the True Cross in Ethiopia
+09/29	Battle of Boqueron in Paraquay
+10/02	Anniversary of Guinean Independence in Guinea
+10/03	Chung Yeung Festival in Hong Kong
+10/03	Francisco Morazan's Birthday in Honduras
+10/05	Anniversary of Proclamation of the Republic in Portugal
+10/08	Battle of Agamos in Peru
+10/09	Independence of Guayaquil in Ecuador
+10/17	Dessaline's Death Anniversary in Haiti
+10/20	Anniversary of the 1944 Revolution in Guatemala
+11/01	Feast of All Saints in Portugal
+11/03	Independence from Columbia in Panama
+11/03	Independence of Cuenca in Ecuador
+11/06	Prophet Mohammed's Birthday in Malaysia
+11/07	Anniversary of Great October Revolution in Bulgaria
+11/08	Her Majesty, the Queen's Birthday in Nepal
+11/10	King's Birthday in Bhutan
+11/11	Angola gains independence from Portugal, 1975
+11/11	Independence of Cartagena in Colombia
+11/12	Prince Charles' Birthday in Fiji
+11/14	King Hussein's Birthday in Jordan
+11/15	Proclamation of the Republic in Brazil
+11/15	Thatlouang Festival in Laos
+11/16	Oklahoma Heritage Week in Oklahoma
+11/17	Corrective Movement in Syrian Arab Republic
+11/18	Battle of Viertieres in Haiti
+11/19	Anniversary of the 1968 Coup by the Army in Mali
+11/19	Garifuna Settlement in Belize
+11/19	Prince of Wales Birthday in Fiji
+11/22	Anniversary of Portuguese Aggression in Guinea
+11/24	Anniversary of the New Regime in Zaire
+11/28	Independence from Spain in Panama
+11/28	Proclamation of the Republic in Chad
+12/01	Anniversary of the Restoration of Independence in Portugal
+12/07	Prophet Mohammed's Birthday in Fiji
+12/08	Blessing of the Water in Uruguay
+12/08	Our Lady of the Cacupe in Paraguay
+12/10	Foundation of Worker's Party in Angola
+12/23	Emperor's Birthday in Japan
+12/25	Birthday of Quaid-i-Azam in Pakistan
+12/26	Feast of Our Theotokos in Greece
+12/29	His Majesty, the King's Birthday in Nepal
+12/30	Anniversary of the Democratic Republic of Madagascar in Madagascar
+12/31	Proclamation of the Republic in Congo
+
+#endif /* !_calendar_holiday_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.judaic b/src/usr.bin/calendar/calendars/calendar.judaic
new file mode 100644
index 0000000..fa2937a
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.judaic
@@ -0,0 +1,36 @@
+/*
+ * Judaic
+ *
+ * $OpenBSD: calendar.judaic,v 1.5 2005/09/06 23:42:59 mickey Exp $
+ */
+
+#ifndef _calendar_judaic_
+#define _calendar_judaic_
+
+Pesach+163	First Day of Rosh Hashanah (Jewish Lunar New Year; 5741 == 1980;
+	sabbatical)
+Pesach+164	Rosh Hashanah (sabbatical)
+Pesach+166	Fast of Gedalya (Murder of Gedalya and subsequent Exile; fast day)
+Pesach+172	Yom Kippur (Day of Atonement; sabbatical, fast day)
+Pesach+178	Succot (Festival of Tabernacles; sabbatical)
+Pesach+179	Succot (sabbatical)
+Pesach+184	Hoshanah Rabba (7th day of Succos)
+Pesach+185	Shmini Atzeres (8th Day of Gathering; sabbatical)
+Pesach+186	Shmini Atzeres/Simchas Torah (Rejoicing of the Law; sabbatical)
+12/12*	First Day of Chanukah
+12/27*	Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
+Pesach-31	Fast of Esther (Battle of Purim; fast day)
+Pesach-30	Purim (Feast of Lots)
+Pesach-29	Purim (Feast of Lots)
+Pesach	Pesach (First Day of Passover; sabbatical)
+Pesach+1	Pesach (sabbatical)
+Pesach+6	Pesach (sabbatical)
+Pesach+7	Pesach (Last Day of Passover; 8th day of Pesach; sabbatical)
+Pesach+34	Lag Ba`omer (Commemoration of the Great Rebellion)
+05/22*	Yom Yerushalayim (Reunification of Jerusalem)
+Pesach+50	Shavuot (Festival of Weeks; sabbatical)
+Pesach+51	Shavuot (Festival of Weeks; sabbatical)
+07/10*	Fast of Shiv'a Asar B'Tammuz (Romans breach Wall of Jerusalem; fast day)
+Pesach+81	Fast of Tish'a B'Av (Babylon destroys Holy Temple; fast day)
+
+#endif /* !_calendar_judaic_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music
new file mode 100644
index 0000000..58b963f
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.music
@@ -0,0 +1,534 @@
+/*
+ * Music
+ *
+ * $OpenBSD: calendar.music,v 1.30 2013/11/26 15:25:56 sobrado Exp $
+ */
+
+#ifndef _calendar_music_
+#define _calendar_music_
+
+01/01	Country Joe McDonald is born in El Monte, California, 1942
+01/03	Steven Stills is born in Dallas, 1945
+01/04	Jazz great Charlie Mingus dies at 57 in Cuernavaca, Mexico, 1979
+01/04	Josef Suk is born in Krecovice, Czechoslovakia, 1874
+01/06	Cesar Cui is born in Vilnius, Russia, 1835
+01/06	Max Bruch is born in Germany, 1838
+01/06	Alexander Scriabin is born in Moscow, 1872
+01/07	Francis Jean Poulenc is born in Paris, 1899
+01/08	Elvis Presley born in East Tupelo, Mississippi, 1935
+01/08	David Bowie (then David Robert Jones) is born in London, 1947
+01/08	Arcangelo Corelli dies in Italy, 1713
+01/09	James Patrick Page (Led Zeppelin) is born in Middlesex, England, 1945
+01/10	Blues guitarist Howlin' Wolf dies in Chicago, 1976
+01/10	Jim Croce is born in Philadelphia, 1943
+01/10	Pat Benatar is born in Long Island, 1952
+01/10	Rod Stewart is born in Glasgow, Scotland, 1945
+01/11	Maurice Durufle is born in Louviers, France, 1902
+01/11	Reinhold Gliere is born in Kiev, Russia, 1875
+01/13	Eric Clapton plays the "Rainbow Concert" in London, 1973
+01/17	Led Zeppelin's first album is released, 1969
+01/19	Janis Joplin is born in Port Arthur, Texas, 1943
+01/20	Walter Piston is born in Rockland, Maine, 1894
+01/20	Ernest Chausson is born in Paris, 1855
+01/22	Sam Cooke is born in Chicago, 1935
+01/23	Edward MacDowell dies, 1908
+01/24	Warren Zevon is born, 1947
+01/25	Bob Dylan plays the second "Hurricane" benefit, in the Astrodome, 1978
+01/25	Wilhelm Furtwangler is born in Berlin, 1886
+01/25	Witold Lutoslawski is born in Warsaw, Poland, 1913
+01/27	Bobby "Blue" Bland (Robert Calvin Bland) is born in Tennessee, 1930
+01/27	Wolfgang Amadeus Mozart is born in Salzburg, Austria, 1756
+01/27	Giuseppe Verdi dies, 1901
+01/27	Eduardo Lalo is born in Lille, France, 1823
+01/28	Jimi Hendrix headlines Madison Square Garden, 1970
+01/30	Lightnin' Hopkins, the most-recorded blues artist ever, dies, 1982
+01/30	Francis Jean Poulenc dies in Paris, 1963
+01/30	Thomas Tallis is born in England, 1505
+01/31	The Grateful Dead are busted in New Orleans, 1970
+01/31	Franz Schubert is born in Lichtenthal, Vienna, Austria, 1797
+02/01	RCA Victor unveils the 45 rpm record playing system, 1949
+02/02	Graham Nash is born in Lancashire, England, 1942
+02/02	Lou Harrison dies in Lafayette, Indiana, en route to a festival
+	of his music at Ohio State University, 2003
+02/02	Giovanni Pierluigi da Palestrina dies near Rome, 1594
+02/03	The Day The Music Died; Buddy Holly, Richie Valens, and the Big
+	Bopper are killed in a plane crash outside Mason City, Iowa, 1959
+02/03	Felix Mendelssohn Bartholdy is born in Hamburg, Germany, 1809
+02/03	Giovanni Pierluigi da Palestrina is born near Rome, 1525
+02/05	Jacques Ibert dies, 1962
+02/07	Beatles land at JFK airport to begin first U.S. tour, 1964
+02/07	Steven Stills makes the first digitally recorded rock album, 1979
+02/07	Witold Lutoslawski dies, 1994
+02/08	John Towner Williams born in New York City, 1932
+02/08	Giuseppe Torelli dies in Bologna, Italy, 1709
+02/09	Carole King (Carole Klein) is born in Brooklyn, 1941
+02/09	Alban Berg is born in Vienna, Austria, 1885
+02/12	The Beatles play Carnegie Hall in New York City, 1964
+02/12	Roy Harris is born, 1898
+02/13	Richard Wagner dies in Venice, Italy, 1883
+02/14	Dmitri Kabalevsky dies in Moscow, 1987
+02/15	Michael Praetorius is born in Creuzburg (date uncertain), 1571
+02/15	Michael Praetorius dies, 1621
+02/15	Francois Charpentier is born in Paris, 1620
+02/15	William Howard Schuman dies, 1992
+02/15	Georges Auric is born in Herault, Languedoc-Roussillon, France, 1899
+02/16	Francois Joseph Gossec dies near Paris, 1829
+02/17	Jazz great Thelonius Monk dies in Englewood, New Jersey, 1982
+02/17	Arcangelo Corelli is born in Fusignano, Italy, 1653
+02/18	Yoko Ono Lennon is born in Tokyo, 1933
+02/19	Paul McCartney's "Give Ireland Back to the Irish" is banned in
+	Britain, 1972
+02/19	William "Smokey" Robinson is born in Detroit, 1940
+02/19	Mikhail Glinka dies, 1857
+02/20	J. Geils (J. Geils Band) is born, 1946
+02/20	Yes sells out Madison Square Garden... without advertising, 1974
+02/20	Carl Czerny is born, 1791
+02/20	Percy Grainger dies in New York City, 1961
+02/21	Morton Gould dies, 1996
+02/21	Andres Segovia is born in Spain, 1893
+02/23	George Friedrich Handel is born in Halle on the Salle, Germany, 1685
+02/23	Johnny Winter is born in Leland, Mississippi, 1944
+02/23	Sir Edward William Elgar dies 1934
+02/24	Howard Hanson dies in Rochester, New York, 1981
+02/25	George Harrison born in Liverpool, England, 1943
+02/27	Alexander Borodin dies, 1887
+02/29	Jimmy Dorsey born, 1904
+02/29	Gioacchino Rossini is born in Pesaro, Italy, 1792
+03/01	Jim Morrison is busted for obscenity in Miami, 1969
+03/01	Frederic Chopin is born in Zelazowa Wola, Warsaw, Poland, 1810
+03/02	Lou Reed born in Brooklyn, New York, 1942
+03/02	Blues guitarist Rory Gallagher is born in Ballyshannon, Ireland, 1949
+03/02	Bedrich Smetana is born, 1824
+03/03	Buffalo Springfield is formed in Los Angeles, 1966
+03/04	Antonio Vivaldi born in Venice, Italy, 1678
+03/05	Sergei Prokofiev dies in Moscow within minutes of Stalin, 1953
+03/05	Heitor Villa-Lobos is born, 1887
+03/06	Zoltan Kodaly dies in Budapest, Hungary, 1967
+03/06	John Philip Sousa dies, 1932
+03/06	Edgard Varese's "Ionisation", the first musical composition to use
+	only percussion instruments, is premiered at Carnegie Hall, 1933
+03/07	Last Gilbert & Sullivan opera produced, 1896
+03/07	Maurice Ravel is born in Ciboure, France, 1875
+03/08	Ron "Pigpen" McKernan (Grateful Dead) dies in California, 1973
+03/08	Hector Berlioz dies, 1869
+03/08	Carl Philipp Emanuel Bach is born, 1714
+03/08	Carlo Gesuldo is born (date uncertain), 1566
+03/08	Alan Hovhaness is born in Somerville, Massachusetts, 1911
+03/09	Robin Trower is born in London, 1945
+03/09	Johann Pachelbel dies in Nuremberg, Germany, 1706
+03/10	Arthur Honegger is born in Le Havre, France, 1892
+03/10	Pablo de Sarasate is born in Pamplona, Spain, 1844
+03/11	Astor Piazzolla is born in Argentina, 1921
+03/13	The Allman Brothers record their live album at the Fillmore East, 1971
+03/13	Cesar Cui dies in Smolensk, Russia, 1918
+03/14	Georg Philipp Telemann is born in Magdeburg, 1681
+03/15	Sly Stone born, 1944
+03/16	Enrique Granados drowns in the English Channel, 1916
+03/17	Paul Kantner (Jefferson Airplane) is born in San Francisco, 1942
+03/18	Nikolai Rimsky-Korsakov is born Tikhvin, Russia, 1844
+03/19	Max Reger is born in Brand, Germany, 1873
+03/21	Johann Sebastian Bach is born in Eisenach, Germany, 1685
+03/21	Modest Mussorgsky is born in Karevo, Pskov (Russia), 1839
+03/21	Alexander Glazunov dies, 1936
+03/22	Ten Years After plays their last concert, 1974
+03/22	Jean-Baptiste Lully dies, 1687
+03/22	Vaclav Nelhybel dies, 1996
+03/25	Aretha Franklin is born in Detroit, 1943
+03/25	Bela Bartok is born in Nagyszentmiklos, Hungary, 1881
+03/25	Claude Debussy dies in Paris, France, 1918 to the sound of World War I
+03/26	Ludwig van Beethoven dies in Vienna, Austria, 1827
+03/26	Emerson, Lake, and Palmer record "Pictures at an Exhibition" live, 1971
+03/27	Ferde Grofe is born in New York City, 1892
+03/28	Sergei Rachmaninov dies in Beverley Hills, California, 1943
+03/28	Modest Mussorgsky dies, 1881
+03/29	Dr. Hook gets a group picture on the cover of "Rolling Stone", 1973
+03/29	Carl Orff dies in Munich, Germany, 1982
+03/30	Eric Clapton is born in Surrey, England, 1945
+03/31	Franz Joseph Haydn is born in Rohrau, Austria, 1732
+04/01	Sergei Rachmaninov is born in Oneg, Russia, 1873
+04/01	Scott Joplin dies in New York City, 1917
+04/02	Marvin Gaye is born in Washington, D.C., 1939
+04/03	Johannes Brahms dies in Vienna, Austria, 1897
+04/03	Ferde Grofe dies in Santa Monica, California, 1972
+04/04	Muddy Waters (McKinley Morganfield) is born in Rolling Fork,
+	Mississippi, 1915
+04/05	Louis Spohr is born in Braunschweig, Germany, 1784
+04/06	Igor Stravinsky dies in New York City, 1971
+04/09	Paul Robeson born, 1898
+04/10	Paul McCartney announces that he's quitting the Beatles, 1970
+04/11	Alberto Ginastera is born in Buenos Aires, 1916
+04/14	Ritchie Blackmore (Deep Purple, Rainbow) is born, 1945
+04/14	George Friedrich Handel dies in London, England, 1759
+04/16	Jean-Joseph Mouret is born in Avignon, France, 1682
+04/18	Yes breaks up after 13 years, 1981
+04/18	Ottorino Respighi dies in Rome, 1936
+04/18	Franz von Suppe is born in Split, Dalmatia (Croatia), 1819
+04/19	Germaine Tailleferre is born at Saint Maur Des Fosses, Ile-de-France,
+	France, 1892
+04/21	Randall Thompson is born, 1899
+04/22	Eduardo Lalo dies in Paris, 1892
+04/22	Giuseppe Torelli is born in Verona, Italy, 1658
+04/25	Blues guitarist Albert King is born, 1925
+04/25	Ella Fitzgerald born, 1918
+04/26	Carol Burnett born in San Antonio, Texas, 1933
+04/27	Sergei Prokofiev is born in Sontsovka, Russia, 1891
+04/27	Oliver Messiaen dies, 1992
+04/27	Alexander Scriabin dies in Moscow from septicemia, 1915
+04/29	"Hair" premiers on Broadway, 1968
+04/29	Edward Kennedy "Duke" Ellington is born in Washington, DC, 1899
+05/01	Kate Smith born, 1909
+05/01	Antonin Dvorak dies in Prague, Czechoslovakia, 1904
+05/01	Aram Khachaturian dies in Moscow, 1978
+05/01	Leo Sowerby is born in Grand Rapids, Michigan, 1895
+05/02	Alessandro Scarlatti is born in Sicily, 1660
+05/03	Bob Seger is born in Ann Arbor, Michigan, 1945
+05/04	George Enescu dies in Paris, France, 1955
+05/07	Johannes Brahms is born in Hamburg, Germany, 1833
+05/07	Pyotr Illych Tchaikovsky is born in Votkinsk, Russia, 1840
+05/07	Beethoven's Ninth Symphony is premiered in the Karntnertortheater in
+	Vienna, Austria, 1824
+05/07	Antonio Salieri dies in Vienna, Austria, 1825
+05/09	Dietrich Buxtehude dies, 1707
+05/10	Dave Mason is born in Worcester, England, 1945
+05/11	Bob Marley dies in his sleep in Miami, Florida, 1981
+05/11	Max Reger dies in Leipzig, Germany, 1916
+05/12	Pink Floyd performs the first quadrophonic concert, 1977
+05/12	Jules Emile Frederic Massenet is born, 1842
+05/12	Berdrich Smetana dies, 1884
+05/14	Lou Harrison is born in Portland, Oregon, 1917
+05/17	Erik Satie is born in Honfleur, France, 1866
+05/17	Paul Dukas dies in Paris, France, 1935
+05/18	Rick Wakeman is born in West London, England, 1949
+05/18	Gustav Mahler dies in Vienna, Austria, 1911
+05/18	Isaac Albeniz dies, 1909
+05/19	Pete Townshend is born in London, 1945
+05/19	Charles Edward Ives is born in Danbury, Connecticut, 1874
+05/20	The Jimi Hendrix Experience is signed by Reprise Records, 1967
+05/21	Franz von Suppe dies, 1895
+05/22	Richard Wagner is born in Leipzig, Germany, 1813
+05/23	Blues great Elmore James dies, 1963
+05/23	Jean Francaix is born, 1912
+05/24	Bob Dylan (Robert Zimmerman) is born in Duluth, 1941
+05/24	Duke Ellington dies, 1974
+05/24	Gabriel Faure is born in Pamiers, Ariege, Midi-Pyrenees, 1845
+05/25	Gustav Holst dies in London, 1934
+05/26	Al Jolson is born, 1886
+05/26	Luciano Berio dies, 2003
+05/27	Louis Durey is born in Paris, France, 1888
+05/27	Niccolo Paganini dies in Nice, Italy, 1840
+05/29	Igor Stravinsky's ballet "Le sacre du printemps" premiere sparks
+	riot in Paris, France, 1913
+05/29	Claude Debussy's ballet "L'Apres-midi d'un faune" premieres in
+	Paris, France, 1912
+05/29	Isaac Albeniz is born, 1860
+05/29	Erich Korngold is born in Brno, Austria-Hungary, 1897
+05/29	Josef Suk dies, 1935
+05/31	The Who perform the loudest concert ever -- 76,000 watts of PA, 1976
+05/31	Franz Joseph Haydn dies in Vienna, Austria, 1809
+06/01	The Beatles release "Sgt. Pepper", 1967
+06/01	Mikhail Glinka is born, 1804
+06/02	Edward William Elgar is born in Lower Broadheath, England, 1857
+06/03	Georges Bizet dies in Bougival, Paris, France, 1875
+06/03	Aram Khachaturian is born in Tiflis, Georgia, 1903
+06/03	Andres Segovia dies in Madrid due to heart attack, 1987
+06/03	Johann Strauss II dies of pneumonia in Vienna, 1899
+06/05	Carl Maria von Weber dies in London, England, 1826
+06/05	Orlando Gibbons dies, 1625
+06/06	"Rock Around The Clock" makes Billboard's #1 slot, 1955
+06/06	Dee Dee Ramone dies, 2002
+06/06	Hanns Eisler is born in Leipzig, 1898
+06/07	Blind Faith debuts in concert at London's Hyde Park, 1969
+06/08	Robert Schumann is born in Zwickau, Germany, 1810
+06/08	Hans Leo Hassler dies, 1612
+06/08	Gordon Jacob dies, 1984
+06/09	Les Paul (Lester Polfus) is born in Waukesha, Wisconsin, 1923
+06/09	Carl Nielsen is born in Sortelung, Denmark, 1865
+06/10	Howlin' Wolf (Chester Burnett) is born in West Point, Mississippi, 1910
+06/10	Judy Garland is born, 1922
+06/10	Ernest Chausson dies in Limary, Seine-et-Oise, France, 1899
+06/11	Richard Strauss is born in Munich, Germany, 1864
+06/12	John Ireland dies, 1962
+06/13	Carlos Chavez is born in Popotla, Mexico, 1899
+06/15	Harry Nilsson is born in Brooklyn, 1941
+06/15	Edvard Hagerup Grieg is born in Bergen, Norway, 1843
+06/15	John Philip Sousa's march "The Washington Post" premiered, 1889
+06/15	Robert Russell Bennett is born, 1894
+06/16	The Monterey Pop festival opens, 1967
+06/16	Maurice Durufle dies in Paris, France, 1986
+06/17	Igor Stravinsky is born in Oranienbaum (now Lomonosov), Russia, 1882
+06/18	Paul McCartney born in Liverpool, England, 1942
+06/18	Richard Rogers is born in Long Island, New York, 1902
+06/20	Jacques Offenbach is born in Cologne, Germany, 1819
+06/21	Columbia records announces the first mass production of LP's, 1948
+06/21	Nikolai Rimsky-Korsakov dies in Lyubensk, Russia, 1908
+06/21	Alan Hovhaness dies in Seattle, Washington, 2000
+06/22	Todd Rundgren is born in Upper Darby, Pennsylvania, 1948
+06/22	Darius Milhaud dies in Geneva, Switzerland, 1974
+06/23	Reinhold Gliere dies, 1956
+06/24	Jeff Beck is born in Surrey, England, 1944
+06/25	Alberto Ginastera dies in Geneva, Switzerland, 1983
+06/25	Georg Philipp Telemann dies in Hamburg, Germany, 1767
+06/25	Michael Joseph Jackson dies in Los Angeles, California, 2009
+06/27	Elvis Presley's last concert, 1977
+06/27	John Entwistle dies in Las Vegas, 2002
+07/01	Erik Satie dies in Paris, France, 1925
+07/02	Felix Pappalardi and Leslie West form Mountain, 1969
+07/02	Christoph Willibald Gluck is born in Erasbach, Upper Palatinate,
+	Bavaria, Germany, 1714
+07/03	Jim Morrison dies in Paris, 1971
+07/03	Louis Durey dies in Provence-Alpes-Cote d'Azur, France, 1979
+07/03	Leos Janacek is born in Hukvaldy, Moravia, 1854
+07/04	Astor Piazzolla dies, 1992
+07/05	Gordon Jacob is born, 1895
+07/07	Gustav Mahler is born in Kalischt, Bohemia, 1860
+07/06	The Jefferson Airplane is formed in San Francisco, 1965
+07/07	Ringo Starr (Richard Starkey) born in Liverpool, England, 1940
+07/07	Leo Sowerby dies in Port Clinton, Ohio, 1968
+07/08	Percy Grainger is born near Melbourne, Australia, 1882
+07/08	Hans Leo Hassler is born in Nuremberg, Germany, 1564
+07/09	Ottorino Respighi is born in Bologna, Italy, 1879
+07/09	Randall Thompson dies, 1984
+07/10	Carl Orff is born in Munich, Germany, 1895
+07/11	George Gershwin dies in Hollywood, California, 1937
+07/12	Chicago DJ Steve Dahl holds "Disco Demolition" at Kamisky Park, 1979
+07/13	Arnold Schoenberg dies in Los Angeles, California, 1951
+07/14	Woodie Guthrie is born, 1912
+07/15	Carl Czerny dies, 1857
+07/15	Ernest Bloch dies, 1959
+07/16	Cream forms in the U.K., 1966
+07/16	Harry Chapin dies on Long Island Expressway, 1981
+07/17	"Yellow Submarine" premieres at the London Pavilion, 1968
+07/20	Carlos Santana is born in Autlan, Mexico, 1947
+07/23	Georges Auric dies, 1983
+07/23	Domenico Scarlatti dies in Madrid, Spain, 1757
+07/24	Ernest Bloch is born, 1880
+07/25	Bob Dylan goes electric at the Newport Folk Festival, 1965
+07/25	Crosby, Stills, Nash & Young debut at the Fillmore East, 1969
+07/26	Mick Jagger is born in Kent, England, 1943
+07/26	JJ Cale (John Weldon Cale) dies in La Jolla, California, 2013
+07/27	Enrique Granados is born in Lleida, Catalonia, Spain, 1867
+07/28	Johann Sebastian Bach dies in Leipzig, Germany, 1750
+07/28	The Watkins Glen "Summer Jam" opens, 1973
+07/28	Antonio Vivaldi dies in Vienna, Austria, 1741
+07/29	Robert Schumann dies in Endenich, Bonn, Germany, 1856
+07/31	Franz Liszt dies shortly before 11:30 in Bayreuth, Germany, 1886
+08/01	The Concert for Bangla Desh takes place at Madison Square Garden, 1971
+08/02	Carlos Chavez dies in the Coyoacan suburb of Mexico City, 1978
+08/04	John Lennon points out that "the Beatles are more popular than Jesus",
+	1966
+08/04	William Howard Schuman is born in the Bronx, New York, 1910
+08/05	Guillaume Dufay is born near Brussels, 1397 (date uncertain)
+08/09	Dmitri Shostakovich dies of lung cancer in Moscow, Russia, 1975
+08/10	Ian Anderson (Jethro Tull) is born in Edinburgh, Scotland, 1947
+08/10	Alexander Glazunov is born in St. Petersburg, Russia, 1865
+08/12	Giovanni Gabrieli dies due to a kidney stone, 1612
+08/12	Maurice Greene is born in London, 1696
+08/12	Leos Janacek dies in Ostrava, Czechoslovakia, 1928
+08/13	Dan Fogelberg is born in Peoria, Illinois, 1951
+08/13	The Bayreuth Festspielhaus opens with the first complete 
+	performance of Wagner's "Ring Cycle", 1876
+08/13	John Ireland is born, 1879
+08/13	Jules Emile Frederic Massenet dies, 1912
+08/15	Beatles replace drummer Pete Best with Richard Starkey, 1962
+08/15	The Beatles play Shea Stadium in New York, 1965
+08/15	Woodstock Festival, Max Yasgur's farm, 1969
+08/15	Jacques Ibert is born, 1890
+08/16	Elvis Presley [allegedly] dies at Graceland, 1977
+08/17	Robert Russell Bennett dies, 1981
+08/18	Antonio Salieri is born in Legnago, Italy, 1750
+08/19	George Enescu is born in Leveni, Romania, 1881
+08/21	Joe Strummer (The Clash), born John Mellor in Ankara, Turkey, 1952
+08/22	Claude Debussy is born in Yvelines, France, 1862
+08/23	Keith Moon is born in London, England, 1946
+08/24	Paul Creston dies, 1985
+08/25	Leonard Bernstein is born in Lawrence, Massachusetts, 1918
+08/26	Jimi Hendrix gives his last performance at the Isle of Wight, 1970
+08/26	Jimi Hendrix's Electric Ladyland Studios opens in New York, 1970
+08/26	Ralph Vaughan Williams dies, 1958
+08/27	Josquin Des Prez dies in Conde, 1521
+08/29	Michael Joseph Jackson is born in Gary, Indiana, 1958
+09/01	Engelbert Humperdinck is born in Siegburg, Germany, 1854
+09/04	Edvard Grieg dies in Bergen, Norway, 1907
+09/04	Anton Bruckner is born in Ansfelden, Austria, 1824
+09/04	Darius Milhaud is born in Aix-en-Provence, France, 1892
+09/06	Hanns Eisler dies in East Berlin, 1962
+09/07	Keith Moon (The Who) dies in London of a drug overdose, 1978
+09/07	Warren Zevon dies in Los Angeles, California, 2003
+09/08	Anton Dvorak is born in Nelahozeves, Czechoslovakia, 1841
+09/08	Ron "Pigpen" McKernan (Grateful Dead) is born in San Bruno,
+	California, 1945
+09/08	Richard Strauss dies in Garmisch-Partenkirchen, Germany, 1949
+09/08	Carlo Gesualdo dies in Avellino in isolation, 1613
+09/08	Nicolas de Grigny is baptized, 1672
+09/11	Francois Couperin dies, 1733
+09/12	John-Philippe Rameau dies, 1764
+09/13	Arnold Schoenberg is born in Vienna, Austria, 1874
+09/14	Francis Scott Key writes words to "Star Spangled Banner", 1814
+09/15	Anton Webern is shot dead by a drunk US soldier in Austria, 1945
+09/15	Horatio Parker is born in Auburndale, Massachusetts, 1863
+09/16	B.B. King is born in Itta Bena, Mississippi, 1925
+09/16	Nadia Boulanger is born, 1887
+09/16	Hildegard von Bingen is born into family of nobles, 1098
+09/17	Hildegard von Bingen dies, 1179
+09/17	Franz Xaver Sussmayr dies, 1803
+09/18	Dee Dee Ramone (Douglas Colvin) born in Fort Lee, Virginia, 1952
+09/19	Simon & Garfunkel reunite to play New York's Central Park, 1981
+09/20	Jim Croce dies in a plane crash, 1973
+09/20	Jean Sibelius dies in Ainola, Finland, 1957
+09/20	Pablo de Sarasate dies in Biarritz, France, 1908
+09/21	Gustav Holst is born in Cheltenham, England, 1874
+09/22	Wagner's "Das Rheingold" premiers at the Munich Court Theater, 1869
+09/23	"Paul is dead" rumors sweep the country, 1969
+09/23	Bruce "The Boss" Springsteen is born in Freehold, New Jersey, 1949
+09/24	Vaclav Nelhybel is born, 1919
+09/25	John Bonham (Led Zeppelin) dies of alcohol poisoning, 1980
+09/25	Dmitri Shostakovich is born in St. Petersberg, Russia, 1906
+09/25	Jean Francaix dies, 1997
+09/25	John-Philippe Rameau is born in France, 1683
+09/26	Bela Bartok dies in New York City, 1945
+09/27	Engelbert Humperdinck dies, 1921
+09/26	George Gershwin is born in Brooklyn, New York, 1898
+09/30	Virgil Thomson dies, 1989
+10/01	Paul Dukas is born in Paris, France, 1865
+10/01	Roy Harris dies, 1979
+10/03	Carl Nielsen dies in Copenhagen, Denmark, 1931
+10/04	Janis Joplin dies of a heroin overdose in Hollywood, 1970
+10/05	Steve Miller is born in Dallas, Texas, 1943
+10/05	Jacques Offenbach dies in Paris, France, 1880
+10/05	Silvestre Revueltas dies in Mexico City, 1940
+10/07	First Bandstand (later, American Bandstand) broadcast, 1957
+10/09	John Lennon born in Liverpool, England, 1940
+10/09	John Entwistle is born in London, England, 1944
+10/09	Camille Saint-Saens is born in Paris, 1835
+10/10	John Prine is born in Maywood, Illinois, 1946
+10/10	Paul Creston is born, 1906
+10/10	Giuseppe Verdi is born in Le Roncole, near Busseto, Italy, 1813
+10/11	Anton Bruckner dies in Vienna, Austria, 1896
+10/12	The Jimi Hendrix Experience is formed in London, 1966
+10/12	Ray Conniff dies after falling down and hitting his head, 2002
+10/12	Ralph Vaughan Williams is born in Down Ampney, Gloucestershire, 1872
+10/14	Leonard Bernstein dies in New York City, 1990
+10/16	Bob Weir (Grateful Dead) is born in San Francisco, 1947
+10/17	"Hair" opens at New York's Public Theater, 1967
+10/17	Frederic Chopin dies in Paris, France, 1849
+10/18	Chuck Berry is born in St. Louis, Missouri, 1926
+10/20	Three members of Lynyrd Skynyrd die in a plane crash, 1977
+10/20	Charles Edward Ives dies in New York City, 1954
+10/20	Max Bruch dies, 1920
+10/21	"Jesus Christ Super Star" debuted on Broadway, 1971
+10/21	Sir Malcolm Arnold is born, 1921
+10/22	Franz Liszt born in Doborjan, Hungary, 1811
+10/22	Pablo Casals dies in Puerto Rico, 1973
+10/22	Nadia Boulanger dies, 1979
+10/22	Louis Spohr dies in Frankfurt, Germany, 1859
+10/24	Luciano Berio is born, 1925
+10/24	Alessandro Scarlatti dies in Naples, 1725
+10/25	Jon Anderson (Yes) is born in Lancashire, England, 1944
+10/25	The Rolling Stones appear on The Ed Sullivan Show, 1964
+10/25	Georges Bizet is born, 1838
+10/25	Johann Strauss II, "The Waltz King", is born in Vienna, 1825
+10/26	Domenico Scarlatti is born in Naples, Italy, 1685
+10/27	Niccolo Paganini is born in Genoa, Italy, 1782
+10/27	Lou Reed dies, 2013
+10/28	Howard Hanson is born in Wahoo, Nebraska, 1896
+10/29	Duane Allman dies in motorcycle crash near Macon, Georgia, 1971
+10/30	Grace Slick is born in Chicago, 1939
+11/02	Jimi Hendrix's "Electric Ladyland" enters US charts at #1, 1968
+11/02	Keith Emerson is born, 1944
+11/03	James Taylor and Carly Simon are married in Manhattan, 1972
+11/04	Felix Mendelssohn Bartholdy dies in Leipzig, Germany, 1847
+11/04	Gabriel Faure dies from pneumonia in Paris, France, 1924
+11/06	Ray Conniff born in Attleboro, Massachusetts, 1916
+11/06	John Philip Sousa, "The March King", is born, 1854
+11/06	Edgard Varese dies, 1965
+11/06	Pyotr Illych Tchaikovsky dies in St. Petersburg, Russia, 1893
+11/07	Joni Mitchell (Roberta Joan Anderson) is born in Alberta, Canada, 1943
+11/07	Germaine Tailleferre dies in Paris, France, 1983
+11/08	Patti Page born, 1927
+11/09	The first issue of "Rolling Stone" is published, 1967
+11/10	Greg Lake is born in Bournemouth, England, 1948
+11/10	Francois Couperin is born, 1668
+11/12	Neil Young is born in Toronto, 1945
+11/12	Walter Piston dies in Belmont, Massachusetts, 1976
+11/12	Alexander Borodin is born in St. Petersburg, Russia, 1833
+11/13	Paul Simon born, 1942
+11/13	Gioacchino Rossini dies at his summer home in Passy, France, 1868
+11/14	Aaron Copland is born in Brooklyn, New York, 1900
+11/15	Christoph Willibald Gluck dies in Vienna, Austria, 1787
+11/16	Bill Ham first demonstrates his psychedelic "Light Show", 1965
+11/17	Heitor Villa-Lobos dies, 1959
+11/18	Carl Maria von Weber is born in Eutin, Germany, 1786
+11/19	Franz Schubert dies in Vienna, Austria, 1828
+11/20	Duane Allman is born in Nashville, Tennessee, 1946
+11/20	Joe Walsh is born in Cleveland, 1947
+11/21	Henry Purcell dies, 1695
+11/22	Benjamin Britten is born, 1913
+11/22	Barnardo Pasquini dies in Rome, 1710
+11/23	Thomas Tallis dies, 1585
+11/24	Scott Joplin born near Linden, Texas, 1867
+11/25	"The Last Waltz" concert is played by The Band at Winterland, 1976
+11/25	Johann Strauss, Jr., writes `On the Beautiful Blue Danube', 1867
+11/25	Virgil Thomson is born in Missouri, 1896
+11/26	Cream performs their farewell concert at Royal Albert Hall, 1968
+11/26	Paul Hindemith is born in Hanau, Germany, 1895
+11/27	Jimi Hendrix (Johnny Allen Hendrix) is born in Seattle, 1942
+11/27	Guillaume Dufay dies in Cambrai, 1474
+11/27	Arthur Honegger dies near Paris, 1955
+11/28	Jean-Baptiste Lully is born in Florence, 1632
+11/29	Pau Casals born in Vendrell, 1876
+11/29	Erich Korngold dies in Hollywood, 1957
+11/29	Giacomo Puccini dies due to throat cancer in Brussels, Belgium, 1924
+11/30	George Harrison dies at 13:30 in L.A., 2001
+11/30	Wilhelm Furtwangler dies in Baden-Baden, Germany, 1954
+11/30	Nicolas de Grigny dies, 1703
+12/01	Jeremiah Clarke dies, 1707
+12/01	Maurice Greene dies, 1755
+12/02	Aaron Copland dies in Tarrytown (now Sleepy Hollow), New York, 1990
+12/03	Anton Webern is born in Vienna, Austria, 1883
+12/04	Frank Zappa dies in his Laurel Canyon home shortly before 18:00, 1993
+12/04	Lord Benjamin Britten dies, 1976
+12/05	Wolfgang Amadeus Mozart dies in Vienna, Austria, 1791
+12/05	JJ Cale (John Weldon Cale) is born in Oklahoma City, Oklahoma, 1938
+12/06	First sound recording made by Thomas Edison, 1877
+12/06	The Rolling Stones play Altamont Speedway near San Francisco, 1969
+12/07	Harry Chapin is born in New York City, 1942
+12/07	Bernardo Pasquini is born in Tuscany, Italy, 1637
+12/08	Jim Morrison is born in Melbourne, Florida, 1943
+12/08	John Lennon is shot and killed in New York City, 1980
+12/08	Jean Sibelius is born in Hameenlinna, Finland, 1865
+12/09	The Who's "Tommy" premieres in London, 1973
+12/10	Morton Gould is born in Richmond Hill, New York, 1913
+12/10	Oliver Messiaen is born in Avignon, France, 1908
+12/11	Hector Berlioz is born at La cote-Saint-Andre, France, 1803
+12/13	Ted Nugent, the motor city madman, born in Detroit, 1949
+12/14	Carl Philipp Emanuel Bach dies, 1788
+12/15	Thomas Edison receives patent on the phonograph, 1877
+12/16	Don McLean's "American Pie" is released, 1971
+12/16	Zoltan Kodaly is born in Kecskemet, Hungary, 1882
+12/16	Camille Saint-Saens dies of pneumonia in Algiers, 1921
+12/17	Ludwig van Beethoven is born in Bonn, Germany, 1770
+12/18	Horatio Parker dies in Cedarhurst, New York, 1919
+12/21	Frank Zappa is born in Baltimore, 1940
+12/21	Silvestre Revueltas born in Santiago Papasquiaro, Durango, Mexico, 1899
+12/22	Beethoven's Symphony No. 5 and Symphony No. 6 premier, under 
+	rehearsed, at Theater an der Wien in Vienna, Austria, 1808
+12/22	Edgard Varese is born in France, 1883
+12/22	Jean-Joseph Mouret dies in Charenton, France, 1738
+12/22	Giacomo Puccini is born in Lucca, Italy, 1858
+12/23	First Gilbert and Sullivan collaboration, Thespis, 1871
+12/23	Joe Strummer (born John Mellor) dies in Broomfield, England, 2002
+12/23	Edward MacDowell is born in New York, 1860
+12/24	Alban Berg dies in Vienna, Austria, 1935
+12/24	John Dunstable dies, 1453
+12/25	John Philip Sousa's "The Stars and Stripes Forever" composed, 1896
+12/25	Leonard Bernstein conducts Beethoven's Symphony No. 9 to honor the
+	fall of the Berlin Wall, 1989, changing "freude" to "freedom"
+12/25	Orlando Gibbons is born in Oxford, England, 1583
+12/28	Edgar Winter is born in Beaumont, Texas, 1946
+12/28	Paul Hindemith dies in Frankfurt am Main, Germany, 1963
+12/28	Maurice Ravel dies in Paris, France, 1937
+12/30	Dmitri Kabalevsky is born in St. Petersburg, Russia, 1904
+12/30	Richard Rogers dies, 1979
+12/31	Jimi Hendrix introduces the Band of Gypsies at the Fillmore East, 1969
+
+#endif /* !_calendar_music_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.openbsd b/src/usr.bin/calendar/calendars/calendar.openbsd
new file mode 100644
index 0000000..2a871c4
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.openbsd
@@ -0,0 +1,108 @@
+/*
+ * OpenBSD-related dates to celebrate
+ *
+ * $OpenBSD: calendar.openbsd,v 1.35 2012/09/18 17:41:13 yasuoka Exp $
+ */
+
+#ifndef _calendar_openbsd_
+#define _calendar_openbsd_
+
+Jan 06	IPF gets integrated into the OpenBSD kernel, 1996
+Jan 06	NRL IPv6 addition to OpenBSD, 1999
+Jan 09	n2k10: Network hackathon, Melbourne, Australia, 17 developers, 2010
+Jan 20	Bind 9 goes into the tree, 2003
+Jan 26	Anoncvs service inaugurated, 1996
+Jan 26	n2k9: Network hackathon, Basel, Switzerland, 19 developers, 2009
+Jan 27	OpenBSD/amd64 port is added, from NetBSD, 2004
+Jan 29	``second anoncvs server is 100 miles from the first'', 1996
+Jan 31	OpenBSD/cats port is added, from NetBSD, 2004
+Feb 03	Describe the ports mechanism [in OpenBSD], 1997
+Feb 13	Unpatented fast block cipher for new password hashing, 1997
+Feb 14	GNU RCS expired from source tree, replaced with OpenRCS, 2007
+Feb 19	IPsec package by John Ioannidis and Angelos D. Keromytis, 1997
+Feb 26	OpenBSD/Amiga gets ISA bus support, 1996
+Feb 26	bridge(4) transparent firewall added to OpenBSD, 1999
+Feb 28	Cryptographic services framework in OpenBSD, 2000
+Mar 10	OpenBSD/WWW translation started -- German, Spanish, Dutch, 2000
+Apr 01	OpenBSD/hppa64 port is added, 2005
+Apr 01	k2k11: Kernel hackathon, Hafnarfjordur, Iceland, 15 developers, 2011
+Apr 10	f2k7: First filesystem hackathon, Vienna, Austria, 14 developers, 2007
+Apr 16	OpenBSD/i386 is ELF, 2003
+Apr 19	OpenBSD/solbourne port is added, 2005
+Apr 21	OpenBSD/luna88k port is added, 2004
+Apr 24	pf2k4: PF hackathon, Sechelt, BC, 12 developers, 2004
+Apr 27	i386/PAE work integrated, 2006
+May 01	OpenBSD 3.3 released, exploiting W^X, 2003
+May 05	n2k8: Network hackathon, Ito, Japan, 18 developers, 2008
+May 08	c2k3 General hackathon, Calgary, Alberta, 51 developers, 2003
+May 09	First commit to OpenBSD stable branch, OPENBSD_2_7, 2000
+May 09	OpenBSD/aviion port is added, 2006
+May 19	OpenBSD 2.3 released, including ``ports'' system, 1998
+May 21	c2k5: General hackathon, Calgary, Alberta, 60 developers, 2005
+May 21	c2k6: General hackathon, Calgary, Alberta, 47 developers, 2006
+May 24	OpenBSD gets a trunk(4), 2005
+May 25	c2k7: General hackathon, Calgary, Alberta, 50 developers, 2007
+May 29	IPF is removed for license incompatibility, 2001
+May 29	OpenBSD/armish port is added, 2006
+May 30	c2k9: General hackathon, Edmonton, Alberta, 46 developers, 2009
+May 31	Initial cut at OpenNTP, 2004
+Jun 01	OpenBSD 2.1 released, first time on CD (double set), 1997
+Jun 04	c99: First hackathon (IPSec), Calgary, Alberta, 10 developers, 1999
+Jun 04	c2k2: General hackathon, Calgary, Alberta, 42 developers, 2002
+Jun 06	c2k8: General hackathon, Edmonton, Alberta, 55 developers, 2008
+Jun 14	r2k6: First network hackathon, Hamburg, Germany, 6 developers, 2006
+Jun 15	OpenBSD 2.7 released, including OpenSSH, 2000
+Jun 15	c2k: First general hackathon, Calgary, Alberta, 18 developers, 2000
+Jun 19	c2k4: General hackathon, Calgary, Alberta, 46 developers, 2004
+Jun 21	c2k1: Birth of PF hackathon, Cambridge, MA, 35 developers, 2001
+Jun 23	OpenBSD/hppa started, based on Utah Lites and OSF MkLinux, 1998
+Jun 24	PF added. Insane amounts of work done by dhartmei@, 2001
+Jun 25	c2k10: General hackathon, Edmonton, Alberta, 46 developers, 2010
+Jul 01	OpenBSD 1.2 released on ftp, 1996
+Jul 01	add strlcpy/strlcat, safe and sensible string copy/append, 1998
+Jul 02	c2k11: General hackathon, Edmonton, Alberta, Canada, 36 developers, 2011
+Jul 11	OpenBSD goes wireless w/ if_wi addition, 1999
+Jul 23	OpenBSD goes multimedia with Brooktree 848 support, 1998
+Jul 24	Non-executable stack on most architectures, 2002
+Jul 25	Gigabit speed to OpenBSD with the addition of if_ti, 1999
+Aug 07	f2k9: Filesystem/uvm hackathon, Stockholm, Sweden, 14 developers, 2009
+Aug 11	OpenBSD/sparc is ELF, 2002
+Aug 12	OpenBSD/sparc is switched to wscons, 2002
+Aug 16	IPX network stack added to OpenBSD, from FreeBSD, 1996
+Aug 17	c2k1-2: Sparc64 hackathon, Washington D.C., 12 developers, 2001
+Aug 17	OpenBSD/sparc64 port is added, from NetBSD, 2001
+Aug 28	k2k6: IPSec hackathon, Schloss Kransberg, Germany, 14 developers, 2006
+Sep 16	s2k11: General hackathon, Ljubljana, Slovenia, 25 developers, 2011
+Sep 19	j2k10: Mini-hackathon, Sakae Mura, Nagano, Japan, 19 developers, 2010
+Sep 26	OpenSSH born, Sunday 11:56 MST, 1999
+Sep 29	OpenBSD/hppa gets PCI bus support, 2003
+Oct 06	OpenBSD/landisk port added, 2006
+Oct 09	p2k9: Ports hackathon, Budapest, Hungary, 14 developers, 2009
+Oct 17	CARP added, introducing OpenBSD into High Availability market, 2003
+Oct 18	OpenBSD born, Wednesday 08:37:01 GMT, 1995
+Oct 18	OpenBSD/mvme88k port added, from nivas, based on MACH/luna88k, 1995
+Oct 18	p2k6: Ports hackathon, Budapest, Hungary, 14 developers, 2006
+Oct 22	p2k7: Ports hackathon, Budapest, Hungary, 13 developers, 2007
+Oct 23	p2k10: Ports hackathon, Budapest, Hungary, 19 developers, 2010
+Oct 24	p2k8: Ports hackathon, Budapest, Hungary, 13 developers, 2008
+Oct 29	OpenBSD 3.6 released, featuring i386 and amd64 SMP, 2004
+Oct 30	OpenBSD 3.4 released, implementing W^X on i386 and AES in VIA C3, 2003
+Nov 01	OpenBSD 3.2 released, ftp mirrors preload for the first time, 2002
+Nov 01	v2k5: First ports hackathon, Venice, Italy, 12 developers, 2005
+Nov 11	want.html added to OpenBSD/www, 1998
+Nov 18	altq merged into pf, 2002
+Nov 20	h2k8: Hardware hackathon, Coimbra, Portugal, 18 developers, 2008
+Nov 21	h2k9: Hardware hackathon, Coimbra, Portugal, 15 developers, 2009
+Nov 22	h2k7: Hardware hackathon, Coimbra, Portugal, 11 developers, 2007
+Nov 25	h2k6: Hardware driver hackathon, Coimbra, Portugal, 14 developers, 2006
+Nov 27	Unified buffer & VM cache enters OpenBSD, 2001
+Nov 30	OpenBSD gets RAID support w/ a dpt(4) addition, 1999
+Dec 01	OpenBSD 3.0 released, including PF, triple set, 2001
+Dec 02	ProPolice stack smash protector incorporated, 2002
+Dec 05	OpenCVS moves development into the tree, 2004
+Dec 07	KAME IPv6 merger TODOs.  you may want to see them earlier..., 1999
+Dec 17	Welkomen OpenBGPD, 2003
+Dec 21	OpenBSD/powerpc port is added, 1996
+Dec 30	OpenBSD/zaurus port is added, 2004
+
+#endif /* !_calendar_openbsd_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.pagan b/src/usr.bin/calendar/calendars/calendar.pagan
new file mode 100644
index 0000000..068af54
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.pagan
@@ -0,0 +1,70 @@
+/*
+ * Pagan
+ *
+ * $OpenBSD: calendar.pagan,v 1.2 2002/03/20 22:53:40 mickey Exp $
+ */
+
+#ifndef _calendar_pagan_
+#define _calendar_pagan_
+
+01/02	Frigg's Distaff
+01/06	Celtic day of the Three-Fold Goddess
+01/10	Geraints Day
+01/13	Midvintersblot
+01/20	Midvintersblot
+01/22	Festival of the Muses
+01/25	Old Disting Feast
+01/TueLast	Upelly - old fire festival
+01/31	Honoring the Valkyries
+02/02	1st Cross-Quarter Day
+02/02	Imbolg / Imbolc (other Celtic names) / Brighid / Oimelc
+02/11	The Day the Birds Begin to Sing
+02/14	Festival of Vali
+03/02	Day of the Crows
+03/13	Burgsonndeg - festival of rebirth of the sun and the approach of spring
+03/17	Celebration of Trefuilnid Treochar (St.Patrick's day)
+03/18	Sheela's Day
+03/19	1st Quarter Day - Spring (Vernal) Equinox
+03/20	Festival of Iduna
+03/21	Ostara / Eostre (Saxon goddess of Spring)
+04/30	May Eve / Walpurgisnacht (witches' Sabbath) / Walpurgis Night (after St. Walpurga)
+05/01	May Day / Beltane / Bealtaine - Celtic bonfire festival
+05/04	2nd Cross-Quarter Day
+05/12	The Cat Parade
+05/14	Midnight Sun Festival
+05/18	Festival of the Horned God Cennunos
+05/20	Festival of Mjollnir, Thor's Hammer
+05/24	Mother's Day, in celebration of the Triple Goddes
+06/20	2nd Quarter Day - Summer Solstice
+06/21	Litha (Norse/Anglo-Saxon for "longest day")
+06/23	St. John's Eve - European Midsummer celebration
+08/01	Lugnasad / Lughnasada / Lunasa - Gaelic summer "games of Lug" (sun-god)
+08/02	Lady Godiva Day
+08/04	Loch mo Naire
+08/05	3rd Cross-Quarter Day
+08/10	Puck Faire
+08/14	Day of the Burryma
+08/17	Odin's Ordeal
+08/23	Feast of Ilmatar
+08/28	Frey Faxi
+08/29	Festival of Urda
+09/21	3rd Quarter Day - Fall (Autumnal) Equinox
+10/08	Day of Remembrance for Erik the Red
+10/09	Leif Erikson Day
+10/11	Old Lady of the Trees
+10/14	Winter Nights - festival celebrating the harvest
+10/18	Great Horn Faire
+10/24	Feast of the Spirits of the Air
+10/27	Allan Apple Day
+10/31	Hallowmas / Allhallowmas / Allhallows
+11/01	Samhain - Celtic feast of departing Sun & new year
+11/05	4th Cross-Quarter Day
+12/06	Festival of Nicolas, an aspect of Odin, leader of the hunt
+12/09	Yule Cleansing - The Danish fetch water for brewing the Yule-Ale
+12/13	Wodan's Jag - the Wild Hunt of Odin and his Army
+12/18	Festival of Epona
+12/20	4th Quarter Day - Winter Solstice
+12/21	Festival of Beiwe / Nertha / Alban Athuan
+12/21	Yule (Norse for "wheel") - Germanic 12-day feast
+
+#endif /* !_calendar_pagan_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.russian b/src/usr.bin/calendar/calendars/calendar.russian
new file mode 100644
index 0000000..2346aae
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.russian
@@ -0,0 +1,12 @@
+/*
+ * Russian calendar files
+ *
+ * $OpenBSD: calendar.russian,v 1.2 2001/09/04 20:44:35 mickey Exp $
+ */
+
+#ifndef _calendar_russian_
+#define _calendar_russian_
+
+#include <ru_RU.KOI8-R/calendar.all>
+
+#endif /* !_calendar_russian_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.space b/src/usr.bin/calendar/calendars/calendar.space
new file mode 100644
index 0000000..eb9c0eb
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.space
@@ -0,0 +1,55 @@
+/*
+ * Space
+ *
+ * $OpenBSD: calendar.space,v 1.3 2006/10/31 18:11:54 jasper Exp $
+ */
+
+#ifndef _calendar_space_
+#define _calendar_space_
+
+01/02	Soviet rocket carrying Lunokhod-1 leaves the Earth's orbit
+	the first time ever (though did not reach the moon), 1959
+01/04	Quadrantid meteor shower (look north)
+01/31	"Ham" the chimpanzee soars into space aboard Mercury-Redstone 2, 1961
+01/31	Explorer I launched, 1958.  Van Allen Belt discovered
+02/18	Pluto discovered by Clyde Tombaugh, Lowell Observatory, AZ, 1930
+02/20	John Glenn orbits the Earth 3 times, 1962
+03/03	Gemini III launched with Virgil Grissom and John Young on board, 1965
+03/16	Robert Goddard launches first liquid-fueled rocket, Auburn MA, 1926
+03/17	Vanguard I launched, 1958.  Earth proved pear-shaped
+03/18	Aleksei Leonov performs first spacewalk, 1965
+03/23	Mir station Flares Farewell after 15 years of service, 2001
+03/28	First reaction thrust motor demonstration, 1883
+03/30	Five rings around Uranus discovered, 1977
+04/12	Yuri Gagarin becomes the first man in space, 1961
+04/12	Space Shuttle Columbia launched, 1981
+04/13	Apollo 13 aborts moon landing due to oxygen tank explosion, 1970
+04/21	Lyrid meteor shower
+05/05	Alan Shepard becomes the first American in space, 1961
+05/14	Skylab (first U.S. space station) launched, 1973
+06/03	Edward White becomes the first American to perform a "Space Walk", 1965
+06/13	Pioneer 10 flies past Neptune's orbit, and becomes the first human
+	artifact to travel beyond the orbits of all known planets, 1983
+07/11	Skylab enters Earth's atmosphere and is destroyed, 1979
+07/04	NASA's Pathfinder lands on Mars, 1997
+07/20	Neil Armstrong and Edwin "Buzz" Aldrin land on moon, 1969
+08/03	First ICBM (P-7) test (5T of iron is launched to Kamchatka), 1957
+08/11	Perseid meteor shower (look north; three days)
+08/12	First test flight of Space Shuttle "Enterprise" from 747, 1977
+08/19	Air Force cargo plane snares payload from Discoverer 14 spy satellite,
+	marking start of practical military reconnaissance from space, 1960
+08/25	First reaction thrust motor design, 1898
+08/29	Star in Cygnus goes nova and becomes 4th brightest in sky, 1975;
+	Nova Cygni 1975.
+10/01	NASA officially begins operations, 1958
+10/04	First space vehicle, Sputnik I, launched, 1957
+10/10	Mercury at Superior Conjunction with Sun.  Moves into night sky. (1984)
+10/18	Soviets announce their probe took photos of the Moon's far side, 1959
+11/03	Sputnik II launched, 1957, bearing space dog Laika
+11/15	Space Shuttle Buran launched, 1988
+12/13	Apollo 17 leaves the moon, with "last" men to walk on moon aboard, 1972
+12/13	Geminid meteor shower (look south)
+12/24	Apollo 8 first manned lunar orbit, 1968
+12/30	Edwin Hubble announces the existence of other galaxies, 1924
+
+#endif /* !_calendar_space_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.ushistory b/src/usr.bin/calendar/calendars/calendar.ushistory
new file mode 100644
index 0000000..71b657a
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.ushistory
@@ -0,0 +1,209 @@
+/*
+ * USA history
+ *
+ * $OpenBSD: calendar.ushistory,v 1.4 2010/01/12 08:11:46 jmc Exp $
+ */
+
+#ifndef _calendar_ushistory_
+#define _calendar_ushistory_
+
+01/01	First Rose Bowl; Michigan 49 - Stanford 0, 1902
+01/02	First military deployment of helicopters (VS-300 by Igor Sikorsky),
+	with a brittish american convoy, 1944
+01/03	After 218 years since discovery by europeans and 92 years after
+	it was purchased from Russian Empire, Alaska becomes 49th state, 1959
+01/05	-50 degrees F, Strawberry UT, 1913
+01/05	The FCC hears the first demonstration of FM radio, 1940
+01/08	Battle of New Orleans
+01/11	Milk delivered in bottles for the first time, 1878
+01/11	Surgeon General condemned cigarettes, 1964
+01/11	The Whiskey-A-Go-Go opens on Sunset Boulevard in Los Angeles, 1963
+01/14	The first "Be-In" is held in Golden Gate Park, 1967
+01/16	Prohibition begins, 1920
+01/18	Grey whale migration, California
+01/24	Eskimo Pie patented by Christian Nelson, 1922
+01/24	Gold discovered in California at Sutter's Mill, 1848
+01/24	A B-52 bomber carrying two 24 megaton bombs crashes at Goldsboro,
+	North Carolina; 5 of 6 safety devices failed on one of them, 1961
+01/27	Grissom, White and Chaffee burned to death in Apollo 1, 1967
+01/28	First ski tow, Woodstock VT, 1914
+01/28	Space Shuttle Challenger (51-L) explodes 74 seconds after liftoff
+	killing Scobee, Smith, McNair, Resnick, Jarvis, Onizuka and McAuliffe,
+	1986
+01/30	Tet Offensive, 1968
+02/01	First TV soap: Secret Storm, 1954
+02/01	Space Shuttle Columbia (STS-107) explodes prior to landing, 2003
+02/09	-51 degrees F, Vanderbilt MI, 1934
+02/12	Lincoln's real birthday
+02/12	Santa Barbara oil leak, 1969
+02/16	Stephen Decatur burns US frigate in Tripoli, 1804
+02/19	US Marines land on Iwo Jima, 1945
+02/21	First telephone directory, New Haven, Connecticut, 1878
+02/21	Malcom X shot to death in Harlem, 1965
+02/29	French and Indian raid on Deerfield MA, 1704
+03/01	Sarah Goode, Sarah Osborne, and Tituba arrested for witchcraft
+	in Salem, Massachusetts, 1692
+03/02	Blackthorn winds (New England)
+03/04	First meeting of Congress, 1789, in N.Y.C.
+03/14	Teddy Roosevelt excludes Japanese laborers from continental US, 1907
+03/15	Buzzards return to Hinckley OH
+03/15	Watts, Los Angeles, riots kill two, injure 25, 1966
+03/16	MyLai Massacre; 300 non-combatant villagers killed by U.S. infantrymen
+03/25	Triangle Shirt Waist Fire, 1911
+03/26	Popeye statue unveiled, Crystal City TX Spinach Festival, 1937
+03/29	Swedish settled Christiana (Wilmington) DE, 1638
+04/04	Martin Luther King assassinated in Memphis, Tennessee, 1968
+04/09	Lee surrenders to Grant at Appomattox Courthouse, 1865
+04/09	Alaska purchased from Russia for $7.2 million, 1867
+04/12	Confederate troops fire first shots of Civil War at Ft Sumter, 1861
+04/14	Lincoln shot in Ford's Theatre by John Wilkes Booth, 1865
+04/15	Ray Kroc opens first McDonalds in Des Plaines, IL, 1955
+04/18	First Laundromat opens, Fort Worth Texas, 1934
+04/18	San Francisco earthquake, 1906
+04/18	Einstein's Death, 1955
+04/20	Supreme Court unanimously rules in favor of busing, 1971
+04/23	Hank Aaron hits his first home run, 1954
+05/03	Anti-war protest disrupts business in Washington, 1971
+05/04	Four Kent State students are shot down by the National Guard, 1970
+05/05	John Scopes arrested for teaching evolution, Dayton, TN, 1925
+05/08	US institutes mining of Haiphong Harbor, 1972
+05/09	94 degrees F, New York, 1979
+05/15	Asylum for Inebriates founded, Binghamton NY, 1854
+05/17	Six SLA members killed in televised gun fight, 1974
+05/21	US explodes first hydrogen bomb, 1956
+05/22	US Civil War ends, 1865
+05/26	Congress sets first immigration quotas, 1924
+05/27	Golden Gate Bridge opens, 1937
+05/30	US Marines sent to Nicaragua, 1912
+06/02	Native Americans "granted" citizenship, 1924
+06/03	A 46-cent computer chip fails, causing the mistaken detection
+	of a Soviet missile attack by the NORAD system. About a 100 B-52
+	bombers were readied for take off along with the President's
+	airborne command post before the error is detected, 1980
+06/05	Robert Kennedy assassinated, 1968
+06/05	US leaves the Gold Standard, 1933
+06/10	Denver police tear gas Jethro Tull and 2000 fans at Red Rocks, 1971
+06/15	Ben Franklin's kite experiment, 1752
+06/16	"The Blues Brothers" premieres in Chicago, 1980
+06/17	Watergate Democratic National Committee break-in, 1972
+06/19	Start of a bus boycott protesting discrimination,
+	Baton Rouge, Louisiana, 1953
+06/22	Civil rights workers disappear in Mississippi, 1964
+06/24	Senate repeals Gulf of Tonkin resolution, 1970
+06/26	Battle of Gettysburg, 1863
+06/27	100 degrees F, Fort Yukon, 1915
+06/27	Bill Graham closes the Fillmore East, 1971
+06/28	Supreme Court decides in favor of Alan Bakke, 1978
+07/01	Battle of Gettysburg begins, 1863
+07/04	Cloudy, 76 degrees F, Philadelphia PA, 1776
+07/04	New York abstains on Declaration of Independence vote, 1776
+07/04	The Louisiana Purchase is announced to the American people, 1803
+07/04	Battles of Vicksburg and Gettysburg won by Union forces, 1863
+07/06	First `talkie' (talking motion picture) premiere in New York, 1928
+07/08	First public reading of the Declaration of Independence, 1776
+07/08	Liberty Bell cracks while being rung at funeral of John Marshall, 1835
+07/09	10-hour working day set by law, NH, 1847
+07/10	134 degrees F, in Death Valley, 1913
+07/16	Detonation of the first atomic bomb at Alamogordo, NM, 1945
+07/18	Ty Cobb gets 4000th base hit, 1927
+07/19	Five Massachusetts women executed for witchcraft, 1692
+07/21	First Train Robbery, Jesse James gets $3000 near Adair, Iowa, 1873
+07/28	B-25 hit 79th floor of Empire State Building, 1945
+07/30	"In God We Trust" made U.S. motto, 1956
+07/31	Harry S. Truman dedicates N.Y. Int'l Airport @ Idlewild Field, 1948,
+	later JFK
+08/06	Cy Young pitches first game, 1890
+08/08	Richard Nixon resigns the US presidency, 1974
+08/08	The Great Train Robbery -- $7,368,000, 1963
+08/09	Helter Skelter... the Charles Manson murders take place, 1969
+08/09	US/Canada border defined in the Webster-Ashburton Treaty, 1842
+08/10	Chicago incorporated as a village of 300 people, 1833
+08/10	US and Panama agree to transfer the canal in the year 2000, 1977
+08/12	Last U.S. ground troops out of Vietnam, 1972
+08/14	Social Security begins in U.S., 1935
+08/14	NYNEX merges with Bell Atlantic, 1997
+08/14	North-East American blackout, 2003
+08/15	Hurricane hits Plymouth Plantation, 1635
+08/17	First public bath opened in N.Y., 1891
+08/18	Anti-Cigarette League of America formed
+08/24	"Alice's Restaurant" premieres in New York and Los Angeles, 1969
+08/24	British troops burn Washington, 1814
+08/28	King leads over 200K in civil rights rally in Washington, DC, 1963
+09/05	Kennedy orders resumption of underground nuclear tests, 1961
+09/05	The first Continental Congress was convened in Philadelphia, 1774
+09/06	Pres. McKinley shot, 1901
+09/08	Star Trek debuts on NBC (1966) with "The Man Trap"
+09/08	President Ford pardons Richard M. Nixon, 1974
+09/09	California becomes the 31st state, 1850
+09/09	United Colonies is renamed the United States, 1776
+09/14	Benjamin Franklin is sent to France as an American minister, 1778
+09/14	Salem, Massachusetts, is founded, 1629
+09/15	Soviet Premier Nikita Khrushchev begins his 13 day tour of the US, 1959
+09/15	The U.S. Foreign Affairs Dept. becomes the U.S. State Department, 1789
+09/16	The village of Shawmut, Massachusetts, becomes the city of Boston, 1630
+09/20	Equal Rights Party nominates Belva Lockwood for President, 1884
+09/20	First meeting of the American Association for the Advancement of
+	Science, 1848
+09/20	First meeting of the National Research Council, 1916
+09/20	The Roxy Theater opens in Hollywood, 1973
+09/22	President Lincoln issues the Emancipation Proclamation, 1862
+09/22	Special prosecutor Leon Jeworski subpoenas President Nixon, 1974
+09/23	The New York Knickerbockers becomes the first U.S. Baseball club, 1845
+09/23	V.P. Nixon denies campaign fund fraud with his "Checkers" speech, 1952
+09/25	Sandra Day O'Connor becomes first woman on US Supreme Court, 1981
+10/02	Thurgood Marshall sworn as the first black Supreme Court Justice, 1967
+10/07	Georgia Tech. beats Cumberland Univ. 222-0, 1916
+10/07	Maryland Governor Marvin Mandel sent to prison on fraud charges, 1977
+10/08	Great Chicago Fire, 1871
+10/10	Spiro T. Agnew resigns as Vice-President due to income tax fraud, 1973
+10/11	"Saturday Night Live" premiers on NBC-TV, 1975
+10/11	The first steam powered ferry ran between New York and Hoboken, 1811
+10/13	U.S. Navy born, authorized by the Second Continental Congress, 1775
+10/14	Chuck Yeager breaks sound barrier, 1947
+10/15	First draft card burned, 1965
+10/15	d.b.a. ("drink good stuff") opens in n.y.c., 1994
+10/18	Boston Shoemakers form first U.S. labor org., 1648
+10/27	New York's Boss Tweed is arrested on fraud charges, 1871
+10/27	The first New York Subway is opened, 1904
+10/28	Harvard was founded in Massachusetts, 1636
+10/28	Statue of Liberty was dedicated on Bedloe's Island, 1886
+10/29	Stock Market Crash, 1929
+10/30	Orson Welles' "War of the Worlds" broadcast, 1938
+11/03	Beef rises to 3 cents a pound, IL, 1837
+11/04	Iranian militants seize US embassy personnel in Teheran, 1979
+11/09	Blackout of New York, New England, and Eastern Canada, 1965
+11/09	Margaret Sanger forms American Birth Control League, 1921
+11/09	Roosevelt establishes the Civil Works Administration, 1933
+11/10	41 Women arrested in suffragette demonstrations near White House, 1917
+11/10	Cpt. Wirz, commandant of Andersonville Prison hanged, 1865
+11/11	Washington becomes the 42nd state, 1889
+11/12	U.S. first exports oil to Europe, 1861
+11/14	Quarter Pounder price raised from $0.53 to $0.55 in violation of Nixon
+	price controls (but okayed by Price Commission after formal request
+	from McDonald's), 1971
+11/15	Niagara Falls power plant startup, 1896
+11/17	46,000 meteoroids fall over AZ in 20 minutes, 1966
+11/17	Richard Nixon says "I am not a crook.", 1973
+11/18	Local standard time zones established for US, 1883
+11/19	Gettysburg Address delivered, 1863
+11/21	Announcement of 18 1/2 minute gap on Watergate tape, 1973
+11/22	Kennedy shot in Dallas, Texas by Lee Harvey Oswald, 1963
+11/23	First broadcast of Dr. Who (longest running TV series), 1963
+11/24	Lee Harvey Oswald killed by Jack Ruby, 1963
+11/27	Hoosac Railroad Tunnel completed, 1873, in NW Massachusetts
+12/01	First national corn-husking championship, Alleman IA, 1924
+12/01	Rosa Parks refuses to move to back of the bus (Montgomery, AL), 1955
+12/04	Washington takes leave of his officers at Fraunce's Tavern, NYC, 1783
+12/05	The Eighteenth Amendment repealed,
+	ending the Prohibition of alcohol, 1933
+12/05	Martin Luther King Jr., leads black boycott of Montgomery buses, 1955
+12/15	Bill of Rights adopted, 1791
+12/15	Sitting Bull shot in head while submitting to arrest, 1890
+12/20	U.S. buys ~1,000,000 sq. miles of Louisiana for ~$20/sq.mi.
+12/24	KKK formed in Pulaski, Tenn, 1865
+12/27	APT report published, 1956
+12/28	Comet Kohoutek at perihelion, 1973
+12/30	First Los Angeles freeway dedicated, 1940
+12/31	Winterland closes its doors, 1978
+
+#endif /* !_calendar_ushistory_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.usholiday b/src/usr.bin/calendar/calendars/calendar.usholiday
new file mode 100644
index 0000000..3b8aa25
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.usholiday
@@ -0,0 +1,40 @@
+/*
+ * USA holiday
+ *
+ * $OpenBSD: calendar.usholiday,v 1.8 2013/03/16 07:52:29 jmc Exp $
+ */
+
+#ifndef _calendar_usholiday_
+#define _calendar_usholiday_
+
+01/01	New Year's Day
+02/02	Groundhog Day
+02/14	St. Valentine's Day
+02/MonThird	President's Day (3rd Monday of February)
+03/05	Mother-in-Law Day
+03/SunSecond	Daylight Saving Time begins; clocks move forward (2nd Sunday of March)
+03/20*	Vernal Equinox
+04/01	April Fool's Day
+04/15	Income Tax Day
+04/28*	Arbor Day (varies from state to state)
+05/SunSecond	Mother's Day (2nd Sunday of May)
+05/SatThird	Armed Forces Day (3rd Saturday of May)
+05/MonLast	Memorial Day (Last Monday of May)
+06/SunThird	Father's Day (3rd Sunday of June)
+06/21*	Summer Solstice
+07/04	Independence Day
+09/MonFirst	Labor Day (1st Monday of September)
+09/SunSecond	Grandparent's Day (2nd Sunday of September; varies from state to state)
+09/22*	Autumnal Equinox
+10/MonSecond	Columbus Day (2nd Monday of October)
+10/31	All Hallows' Eve (Halloween)
+11/TueFirst	Election Day (1st Tuesday after 1st Monday for even years)
+11/SunFirst	Daylight Saving Time ends; clocks move back (1st Sunday in November)
+11/11	Veterans' Day
+11/ThuFourth	Thanksgiving Day (4th Thursday in November)
+12/21*	Winter Solstice
+12/24	Christmas Eve
+12/25	Christmas
+12/31	New Year's Eve
+
+#endif /* !_calendar_usholiday_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.world b/src/usr.bin/calendar/calendars/calendar.world
new file mode 100644
index 0000000..c59be6f
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.world
@@ -0,0 +1,18 @@
+/*
+ * World wide calendar files, except national calendars
+ *
+ * $OpenBSD: calendar.world,v 1.1 1996/12/05 06:04:51 millert Exp $
+ */
+
+#ifndef _calendar_world_
+#define _calendar_world_
+
+#include <calendar.birthday>
+#include <calendar.christian>
+#include <calendar.computer>
+#include <calendar.history>
+#include <calendar.holiday>
+#include <calendar.judaic>
+#include <calendar.music>
+
+#endif /* !_calendar_world_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
new file mode 100644
index 0000000..4fd9872
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -0,0 +1,17 @@
+/*
+ * deutscher Kalender
+ *
+ * $OpenBSD: calendar.all,v 1.1 1996/12/05 06:04:52 millert Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_all_
+#define _de_DE_ISO_8859_1_all_
+
+#include <de_DE.ISO_8859-1/calendar.feiertag>
+#include <de_DE.ISO_8859-1/calendar.geschichte>
+#include <de_DE.ISO_8859-1/calendar.kirche>
+#include <de_DE.ISO_8859-1/calendar.literatur>
+#include <de_DE.ISO_8859-1/calendar.musik>
+#include <de_DE.ISO_8859-1/calendar.wissenschaft>
+
+#endif /* !_de_DE.ISO_8859-1_all_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
new file mode 100644
index 0000000..fed8ab7
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -0,0 +1,42 @@
+/*
+ * Feiertage
+ *
+ * $OpenBSD: calendar.feiertag,v 1.3 2006/04/15 18:20:43 bernd Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_feiertag_
+#define _de_DE_ISO_8859_1_feiertag_
+
+LANG=de_DE.ISO_8859-1
+
+/* arbeitsfreie staatliche Feiertage */
+01/01	Neujahr
+05/01	Maifeiertag
+10/03	Tag der deutschen Einheit
+
+/*  arbeitsfreie christliche Feiertage */
+Easter-2	Karfreitag
+Easter   	Ostersonntag
+Easter+1 	Ostermontag
+Easter+49	Pfingstsonntag
+Easter+50	Pfingstmontag
+Easter+39	Christi Himmelfahrt
+
+/*  Gedenktage - nicht arbeitsfreie Feiertage :-( */
+01/27	Befreiung des KZ Auschwitz durch die Rote Armee, 1945
+06/17	Arbeiteraufstand am 17. Juni 1953
+
+/* Jahreszeiten */
+03/21*	Frühlingsanfang
+06/21*	Sommeranfang
+09/21*	Herbstanfang
+12/21*	Winteranfang	
+
+/* Sommer- und Winterzeit */
+03/SundayLast	Anfang der Sommerzeit
+10/SundayLast	Ende der Sommerzeit
+
+/* Blumenverkäufer */
+May Sun+2 	Muttertag
+
+#endif /*! _de_DE_ISO_8859_1_feiertag_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
new file mode 100644
index 0000000..6920274
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -0,0 +1,202 @@
+/*
+ * deutsche Geschichte
+ *
+ *
+ * Die Angaben wurden überwiegend entnommen aus dem Buch:
+ *
+ * Fragen an die deutsche Geschichte, Ideen, Kräfte, Entscheidungen von
+ * 1800 bis zur Gegenwart; historische Ausstellung im Reichstagsgebäude
+ * in Berlin; Katalog, 16. Auflage, Sonderausgabe - Bonn: Deutscher
+ * Bundestag, Referat Öffentlichkeitsarbeit, 1990
+ *
+ * English Title: Questions on German history
+ *
+ * ISBN 3-924521-59-X
+ *
+ * $OpenBSD: calendar.geschichte,v 1.8 2007/09/06 17:45:19 bernd Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_geschichte_
+#define _de_DE_ISO_8859_1_geschichte_
+
+LANG=de_DE.ISO_8859-1
+
+/* 1800-1933 */
+07/11	Gründung des Rheinbundes, 1806
+10/14	Doppelschlacht bei Jena und Auerstedt, 1806
+10/16	Völkerschlacht bei Leipzig, 1813
+06/18	Niederlage Napoleons bei Waterloo, 1815
+10/18	Wartburgfest der Deutschen Burschenschaften, 1817
+01/01	Inkrafttreten des Vertrages über den deutschen Zollverein, 1834
+12/07	erste deutsche Eisenbahn zwischen Nürnberg und Fürth, 1835
+06	Aufstand der schlesischen Weber, 1844
+12/21	Verabschiedung des Gesetzes über die Grundrechte des deutschen
+	Volkes durch die Frankfurter Nationalversammlung, 1848
+03/27	Annahme der deutschen Reichsverfassung in der Frankfurter
+	Paulskirche, Wahl von Friedrich Wilhelm IV von Preußen zum
+	deutschen Kaiser, 1849
+04/28	Ablehnung der deutschen Kaiserkrone durch den preußischen König, 1849
+07/03	Schlacht von Königgrätz
+07/13	Emser Depesche, 1870
+07/18	Verkündung des Dogmas von der päpstlichen Unfehlbarkeit
+	durch das I. Vatikanische Konzil
+01/18	Proklamation des deutschen Kaiserreiches in Versailles, 1871
+10/18	Verabschiedung des Sozialistengesetzes durch den Reichstag, 1878
+03/20	Entlassung von Bismarck als Reichskanzler und
+	preußischer Ministerpräsident, 1890
+06/21	Eröffnung des Nord-Ostsee-Kanals, 1895
+01/07	Billigung des Bürgerlichen Gesetzbuches (BGB) durch den Reichstag, 1896
+01/01	Bürgerliches Gesetzbuch tritt in Kraft, 1900
+06/28	Ermordung des österreichischen Thronfolgers Erzherzog Franz
+	Ferdinand durch serbische Nationalisten in Sarajewo, 1914
+07/28	Kriegserklärung Österreich-Ungarns an Serbien, 1914
+08/01	Deutsche Mobilmachung und Kriegserklärung an Rußland, 1914
+08/03	Deutsche Kriegserklärung an Frankreich, 1914
+08/04	Kriegserklärung Großbritaniens an Deutschland, 1914
+08/04	Bewilligung der Kriegskredite im Reichstag, 1914
+08/26	Schlacht bei Tannenberg, 1914
+02/21	Schlacht um Verdun, 1916
+03/08	Ausbruch der Revolution in Rußland, Abdankung von Zar Nikolaus II, 1917
+04/06	Kriegserklärung der USA an Deutschland
+12/15	Waffenstillstand zwischen Rußland und Deutschland, 1917
+03/03	Frieden von Brest-Litowsk, 1918
+11/03	Matrosenaufstand in Kiel, 1918
+11/09	Ausrufung der Republik durch Scheidemann (SPD), 1918
+02/11	Friedrich Ebert wird Reichspräsident, Weimar 1919
+06/28	Unterzeichnung des Versailler Vertrages, 1919
+03/21	Volksabstimmung in Oberschlesien, 1921
+04/16	Vertrag von Rapallo, 1922
+06/24	Ermordung von Reichsaußenminister Rathenau, 1922
+01/11	Besetzung des Ruhrgebietes durch Frankreich+Belgien, 1923
+09/10	Eintritt Deutschlands in den Völkerbund, 1926
+10/25	Schwarzer Freitag in New York, Beginn der Weltwirtschaftskrise, 1929
+08/06	Europas erste Autobahn eingeweiht, 1932
+
+
+/* II. Weltkrieg */
+10/14	Austritt aus dem Völkerbund, 1933
+03/16	Wiedereinführung der allgemeinen Wehrpflicht, 1935
+10/25	Deutsch-italienischer Vertrag, Achse Berlin-Rom, 1936
+11/25	Antikominternpakt zwischen Deutschland und Japan, 1936
+01/13	Volksabstimmung im Saargebiet über die Rückführung in's Reich, 1935
+03/12	Einmarsch deutscher Truppen in Österreich, 1938
+09/29	Münchner Abkommen, 1938
+03/15	Einmarsch deutscher Truppen in die Tschechoslowakei, 1939
+03/23	Rückgabe des Memelgebietes an Deutschland, 1939
+08/23	Abschluß des Hitler-Stalin-Paktes, 1939
+09/03	Kriegserklärung Großbritaniens und Frankreichs an Deutschland, 1939
+04/09	Besetzung Dänemarks, Invasion in Norwegen, 1940
+05/10	Deutscher Angriff auf Belgien, die Niederlande, Luxemburg
+	und Frankreich, 1940
+06/22	Angriff gegen die Sowjetunion, 1941
+12/11	Kriegserklärung Deutschlands an die USA, 1941
+01/14	Konferenz von Casablanca, 1943
+01/31	Kapitulation der 6. deutschen Armee in Stalingrad, 1943
+06/06	Alliierte Landung in Nordwestfrankreich, 1944
+02/04	Konferenz von Jalta, 4.-11.2. 1945
+04/25	Zusammentreffen von amerikanischen und sowjetischen Truppen
+	bei Torgau an der Elbe, 1945
+05/08	Bedingungslose Kapitulation Deutschlands, 1945
+07/01	Rückzug der britischen und amerikanischen Truppen aus
+	Sachsen, Thüringen und Mecklenburg, Einmarsch westlicher
+	Truppen in Berlin, 1945
+07/17	Potsdammer Konferenz, 1945
+09/01	Überfall auf Polen, Beginn des 2. Weltkrieges, 1939
+10/01	Verkündung der Urteile im Nürnberger
+	Hauptkriegsverbrecherprozeß, 1946
+02/25	Auflösung des Landes Preußen durch den Kontrollrat, 1947
+08/06	erster Atombombenabwurf auf Hiroshima, 1945
+08/08	Atombombenabwurf auf Nagasaki, 1945
+04/19	Warschauer Ghetto Aufstand, 1943
+12/07	Japan bombardiert Pearl Harbor, 1941
+
+/* Deutschland nach dem 2. Weltkrieg */
+04/11	Attentat auf Dutschke, Studentenunruhen, 1958
+05/05	Natobeitritt, Wiederbewaffnung, Souveränität der Bundesrepublik, 1955
+05/06	Rücktritt von Brandt, 1974
+05/16	Wahl von Schmidt (SPD) zum Bundeskanzler, 1974
+05/23	Verkündung des Grundgesetzes
+05/23	Wahl von Richard von Weizsäcker zum Bundespräsidenten, 1984
+06/05	Marshallplan, 1947
+06/20	Währungsreform in den Westzonen, 1948
+06/24	Beginn der Berliner Blockade, 1948
+07/01	Wahl von Heinrich Lübke zum Bundespräsidenten, 1959
+07/01	Währungs-, Wirtschafts- und Sozialunion, 1990
+08/12	deutsch-sowjetischer Gewaltverzichtsvertrag, Moskau 1970
+08/14	Wahl zum ersten deutschen Bundestag, 1949
+09/03	Vier-Mächte-Abkommen über Berlin, 1971
+09/05	Entführung von Arbeitgeberpräsident Schleyer, 1977
+09/07	DDR-Staatsratsvorsitzender Honecker in der Bundesrepublik, 1987
+09/12	Wahl von Theodor Heuss (FDP) zum Bundespräsidenten, 1949
+09/15	Wahl von Konrad Adenauer (CDU) zum Bundeskanzler, 1949
+09/17	Bruch der Sozialliberalen Koalition, 1982
+09/18	Aufnahme von Bundesrepublik und DDR in die UNO, 1973
+10/01	Ablösung von Bundeskanzler Schmidt durch Kohl, 1982
+10/13	Entführung der Lufthansa-Maschine "Landshut" nach Mogadischu, 1977
+10/18	Ermordung von Arbeitgeberpräsident Schleyer, 1977
+10/23	Volksabstimmung im Saargebiet, 1955
+12/02	Washingtoner Abkommen über Bi-Zone, 1946
+12/07	deutsch-polnischer Vertrag, Warschau 1970
+12/10	Friedensnobelpreis für Brandt, 1971
+12/12	Nachrüstungsbeschluß des NATO-Ministerrates, 1979
+12/21	Grundlagenvertrag zwischen DDR und Bundesrepublik, 1972
+
+
+/* Nationalsozialismus */
+11/09	Hitler-Putsch in München/Marsch auf die Feldherrenhalle, 1923
+11/09	Reichskristallnacht, 1938
+09/14	Reichstagswahl: Erdrutsch zugunsten der NSDAP, 1930
+07/31	Reichstagswahl: NSDAP wird stärkste Fraktion, 1932
+11/06	Reichstagswahl: Rückgang der NSDAP, 1932
+01/30	Ernennung von Hitler zum Reichskanzler, 1933
+02/27	Reichstagsbrand, 1933
+03/05	Reichstagswahl: Mehrheit für NSDAP+DNVP, 1933
+03/23	Annahme des Ermächtigungsgesetzes, 1933
+03/31	Erstes Gesetz zur Gleichschaltung der Länder, 1933
+04/01	Organisierter Boykott jüdischer Geschäfte, 1933
+04/07	Zweites Gesetz zur Gleichschaltung der Länder, 1933
+05/02	Auflösung der Gewerkschaften, 1933
+06	Auflösung aller Parteien außer NSDAP, 1933
+07/20	Konkordat zwischen Deutschland und dem Vatikan, 1933
+06/30	Röhm-Putsch, Ausschaltung der SA-Führung, 1934
+09/15	Nürnberger Gesetze, 1935
+08/01	Eröffnung der XI. Olympischen Spiele in Berlin, 1936
+01/20	Wannseekonferenz, 1942
+04/30	Selbstmord Hitlers, 1945
+07/29	Mussolini geboren, 1883
+
+/* Sozialismus */
+01/19	Markus Johannes Wolf geboren, 1923
+01/21	Lenin gestorben, 1924
+06	Gründung des Bundes der Kommunisten in London durch Marx+Engels, 1847
+05/23	Gründung des Allgemeinen Deutschen Arbeitervereins in Leipzig
+	unter Führung von Ferdinand Lassalles, 1863
+08/07	Gründung der Sozialdemokratischen Arbeiterpartei in Eisenach
+	unter der Führung von August Bebel und Wilhelm Liebknecht, 1869
+04/06	Gründung der Unabhängigen Sozialdemokratischen Partei, Gotha 1917
+11/07	Oktoberrevolution in Rußland, Putsch der Bolschewisten, 1917
+12/31	Gründung der KPD, 1918
+01/15	Ermordung von Rosa Luxemburg und Karl Liebknecht, 1919
+03/05	Tod Stalins, 1953
+03/18	Erste demokratische Volkskammerwahl, 1990
+04/21	Zwangsvereinigung von KPD und SPD zur SED, 1946
+04/25	GAU in Tschernobyl, 1986
+05/14	Gründung des Warschauer Paktes, 1955
+06/17	Arbeiteraufstand am 17. Juni 1953
+06/25	Beginn des Korea-Krieges, 1950
+08/13	Bau der Berliner Mauer, 1961
+08/21	Einmarsch des Warschauer Pakts in die Tschechoslowakei, 1968
+09/09	Mao Tse-Tung gestorben im Alter von 82 Jahren, 1976
+10/03	Offizielles Ende der DDR, 1990 :-)
+10/07	Gründung der DDR 1949
+10/09	Massendemonstration in Leipzig, 1989
+10/09	Markus "Mischa" Wolf gestorben, 2006
+10/14	Kuba-Krise, 1962
+10/18	Ablösung von Erich Honecker als SED-Generalsekretär, 1989
+11/09	Fall der Berliner Mauer, 1989
+11/10	Sowjetischer Präsident Leonid Breschnew gestorben, Alter 75, 1982
+03/27	Chruschtschow wird sowjetischer Präsident, 1958
+10/12	Chruschtschow schlägt während einer Rede in der UNO mit den
+	Schuhen auf den Tisch, 1960
+
+#endif /* _de_DE_ISO_8859_1_geschichte_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
new file mode 100644
index 0000000..8776b9e
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -0,0 +1,32 @@
+/*
+ * Kirche in Deutschland
+ *
+ * $OpenBSD: calendar.kirche,v 1.2 1997/08/27 11:20:39 provos Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_kirche_
+#define _de_DE_ISO_8859_1_kirche_
+
+LANG=de_DE.ISO_8859-1
+
+Easter-46	Aschermittwoch
+Easter-48	Rosenmontag
+Easter-7	Palmsonntag
+
+11/Sun-3	Volkstrauertag (maybe)
+11/Sun-2	Volkstrauertag oder Totensonntag
+11/Sun-1	1. Advent oder Totensonntag
+12/Sun+1	1. oder 2. Advent
+12/Sun+2	2. oder 3. Advent
+12/Sun+3	3. oder 4. Advent
+12/Sun+4	4. Advent (maybe)
+
+12/06	Nikolaus
+12/25	1. Weihnachtstag
+12/26	2. Weihnachtstag
+
+/* Evangelische Kirche */
+11/10	Martin Luther geboren in Eisleben, 1483
+10/31	95 Thesen von Luther, Wittenberg, 1517
+
+#endif /* !_de_DE_ISO_8859_1_kirche_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
new file mode 100644
index 0000000..5e01c43
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -0,0 +1,45 @@
+/*
+ * Literatur
+ *
+ * $OpenBSD: calendar.literatur,v 1.5 2005/09/12 21:07:28 sturm Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_literatur_
+#define _de_DE_ISO_8859_1_literatur_
+
+LANG=de_DE.ISO_8859-1
+
+/* Schriftsteller */
+
+01/04	Jakob Grimm geboren, 1785
+01/18	Arno Schmidt in Hamburg geboren, 1914
+02/09	Thomas Bernhard in Heerlen geboren, 1931
+02/12	Immanuel Kant in Königsberg gestorben, 1804
+02/12	Thomas Bernhard in Gmunden gestorben, 1989
+02/17	Heinrich Heine in Paris gestorben, 1856
+03/22	Johann Wolfgang von Goethe in Weimar gestorben, 1832
+04/22	Immanuel Kant in Königsberg geboren, 1724
+05/09	Friedrich von Schiller in Weimar gestorben, 1805
+06/03	Arno Schmidt in Celle gestorben, 1979
+06/03	Franz Kafka in Prag gestorben, 1924
+06/06	Thomas Mann in Lübeck geboren, 1875
+07/03	Franz Kafka in Wien geboren, 1883
+08/12	Thomas Mann in Kilchberg bei Zürich gestorben, 1955
+08/27	Georg Wilhelm Friedrich Hegel in Stuttgart geboren, 1770
+08/28	Johann Wolfgang von Goethe in Frankfurt am Main geboren, 1749
+09/20	Theodor Fontane in Berlin gestorben, 1898
+10/16	Günter Grass in Danzig geboren, 1927
+11/10	Friedrich von Schiller in Marbach geboren, 1759
+11/14	Georg Wilhelm Friedrich Hegel in Berlin gestorben, 1831
+12/13	Heinrich Heine in Düsseldorf geboren, 1797
+12/30	Theodor Fontane in Neuruppin geboren, 1819
+
+/* Verlage */
+03/09	"die tageszeitung" als erste täglich aktualisierte deutsche
+	Tageszeitung im WWW, 1995, Betatest, vollständige Ausgabe
+05/05	Schweriner Volkszeitung als erste deutsche Tageszeitung im WWW, 1995
+05/12	"die tageszeitung" offiziell im WWW, 1995
+08/31	Hitler stellt Frankfurter Zeitung ein, 1943
+11/01	Frankfurter Allgemeine Zeitung ins Leben gerufen, 1949
+
+#endif /* !_de_DE_ISO_8859_1_literatur_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
new file mode 100644
index 0000000..a339df1
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -0,0 +1,57 @@
+/*
+ * Musik
+ *
+ * $OpenBSD: calendar.musik,v 1.4 2005/09/12 21:07:28 sturm Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_musik_
+#define _de_DE_ISO_8859_1_musik_
+
+LANG=de_DE.ISO_8859-1
+
+/* Klassik */
+01/27	Wolfgang Amadeus Mozart in Salzburg geboren, 1756
+01/31	Franz Schubert in Lichtenthal bei Wien geboren, 1797
+02/03	Felix Mendelssohn Bartholdy in Hamburg geboren, 1809
+02/13	Richard Wagner in Venedig gestorben, 1883
+02/23	Georg Friedrich Händel in Halle an der Saale geboren, 1685
+03/01	Frederic Chopin in Zelazowa-Wola bei Warschau geboren, 1810
+03/21	Johann Sebastian Bach in Eisenach geboren, 1685
+03/25	Bela Bartok in Nagyszentmiklos geboren, 1881
+03/26	Ludwig van Beethoven in Wien gestorben, 1827
+03/28	Sergej Rachmaninow in Beverley Hills gestorben, 1943
+03/29	Carl Orff in München gestorben, 1982
+03/31	Joseph Haydn in Rohrau geboren, 1732
+04/01	Sergej Rachmaninow in Oneg geboren, 1873
+04/14	Georg Friedrich Händel in London gestorben, 1759
+05/07	Johannes Brahms in Hamburg geboren, 1833
+05/18	Gustav Mahler in Wien gestorben, 1911
+05/22	Richard Wagner in Leipzig geboren, 1813
+05/31	Joseph Haydn in Wien gestorben, 1809
+06/03	Georges Bizet in Bougival bei Paris gestorben, 1875
+06/05	Carl Maria von Weber in London gestorben, 1826
+06/08	Robert Schumann in Zwickau geboren, 1810
+06/11	Richard Strauss in München geboren, 1864
+06/15	Edvard Grieg in Bergen geboren, 1843
+07/07	Gustav Mahler in Kalischt geboren, 1860
+07/10	Carl Orff in München geboren, 1895
+07/28	Johann Sebastian Bach in Leipzig gestorben, 1750
+07/29	Robert Schumann in Endenich bei Bonn gestorben, 1856
+09/04	Edvard Grieg in Bergen gestorben, 1907
+09/08	Richard Strauss in Garmisch-Partenkirchen gestorben, 1949
+09/26	Bela Bartok in New York gestorben, 1945
+10/17	Frederic Chopin in Paris gestorben, 1849
+10/22	Franz Liszt geboren, 1811
+10/25	Georges Berlioz in Paris geboren, 1838
+11/04	Felix Mendelssohn Bartholdy in Leipzig gestorben, 1847
+11/18	Carl Maria von Weber in Eutin geboren, 1786
+11/19	Franz Schubert in Wien gestorben, 1828
+11/26	Paul Hindemith in Hanau geboren, 1895
+12/05	Wolfgang Amadeus Mozart in Wien gestorben, 1791
+12/16	Ludwig van Beethoven in Bonn geboren, 1770
+12/28	Paul Hindemith in Frankfurt am Main gestorben, 1963
+
+/* Pop */
+09/18	Jimi Hendrix gestorben
+
+#endif /* !_de_DE_ISO_8859_1_musik_ */
diff --git a/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
new file mode 100644
index 0000000..200aa67
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -0,0 +1,19 @@
+/*
+ * Wissenschaft
+ *
+ * $OpenBSD: calendar.wissenschaft,v 1.4 2006/06/22 09:21:25 mickey Exp $
+ */
+
+#ifndef _de_DE_ISO_8859_1_wissenschaft_
+#define _de_DE_ISO_8859_1_wissenschaft_
+
+LANG=de_DE.ISO_8859-1
+
+04/12	erster Mann im All, Juri Gagarin, 1961
+04/18	Einstein gestorben, 1955
+06/22	Konrad Zuse geboren, Berlin, 1910
+10/04	Sputnik 1, erster Satellit im Weltraum, 1957
+12/18	Konrad Zuse gestorben, 1995, Hünfeld
+
+
+#endif /* ! _de_DE_ISO_8859_1_wissenschaft_ */
diff --git a/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
new file mode 100644
index 0000000..2eec792
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all
@@ -0,0 +1,14 @@
+/*	$OpenBSD: calendar.all,v 1.2 2004/01/16 18:43:28 mickey Exp $	*/
+
+/*
+ * Calendrier français
+ */
+
+#ifndef _fr_FR_ISO8859_1_all_
+#define _fr_FR_ISO8859_1_all_
+
+#include <fr_FR.ISO8859-1/calendar.jferies>
+#include <fr_FR.ISO8859-1/calendar.fetes>
+#include <fr_FR.ISO8859-1/calendar.proverbes>
+
+#endif /* !_fr_FR.ISO8859-1_all_ */
diff --git a/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
new file mode 100644
index 0000000..6499b6a
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes
@@ -0,0 +1,630 @@
+/*	$OpenBSD: calendar.fetes,v 1.5 2006/11/14 10:25:03 aanriot Exp $	*/
+
+/*
+ * Fêtes à souhaiter
+ */
+
+#ifndef _fr_FR_ISO8859_1_fetes_
+#define _fr_FR_ISO8859_1_fetes_
+
+LANG=fr_FR.ISO8859-1
+
+/*
+ * N.B.: ceci n'est pas un calendrier liturgique !
+ *	 Il a seulement été réalisé pour me faire payer à boire
+ *	 par mes collègues de travail ; on n'y trouve donc que
+ *	 des prénoms seuls.
+ *
+ *	 Par ex. « St Antoine de Padoue » se retrouve abrégé en
+ *	 Antoine, et si Antoine est fêté plusieurs jours par an,
+ *	 tant mieux pour lui, c'est voulu.
+ */
+
+01/01	Aujourd'hui, c'est la St(e) Almaque.
+01/01	N'oubliez pas les Télémaque !
+01/02	Bonne fête aux Basile !
+01/02	Aujourd'hui, c'est la St(e) Vassili.
+01/02	N'oubliez pas les Grégoire !
+01/03	Bonne fête aux Geneviève !
+01/03	Aujourd'hui, c'est la St(e) Ginette.
+01/04	N'oubliez pas les Odilon !
+01/04	Bonne fête aux Angèle !
+01/04	Aujourd'hui, c'est la St(e) Robert.
+01/05	N'oubliez pas les Édouard !
+01/05	Bonne fête aux Gerlac !
+01/06	Aujourd'hui, c'est la St(e) Mélaine.
+01/06	N'oubliez pas les André !
+01/07	Galette des rois
+01/07	Aujourd'hui, c'est la St(e) Raymond.
+01/07	N'oubliez pas les Raymonde !
+01/07	Bonne fête aux Virginie !
+01/08	Aujourd'hui, c'est la St(e) Lucien.
+01/08	N'oubliez pas les Lucienne !
+01/08	Bonne fête aux Peggy !
+01/08	Aujourd'hui, c'est la St(e) Gudule.
+01/09	N'oubliez pas les Adrien !
+01/09	Bonne fête aux Alix !
+01/10	Aujourd'hui, c'est la St(e) Guillaume.
+01/10	N'oubliez pas les Guillemette !
+01/11	Bonne fête aux Paulin !
+01/11	Aujourd'hui, c'est la St(e) Pauline.
+01/12	N'oubliez pas les Tatiana !
+01/12	Bonne fête aux Alfred !
+01/12	Aujourd'hui, c'est la St(e) Ailred (Aelred, Eilred, Elred).
+01/13	N'oubliez pas les Vivant !
+01/13	Bonne fête aux Vivence !
+01/13	Aujourd'hui, c'est la St(e) Hilaire.
+01/13	N'oubliez pas les Yvette !
+01/14	Bonne fête aux Nina !
+01/14	Aujourd'hui, c'est la St(e) Séraphin.
+01/15	N'oubliez pas les Rémi !
+01/16	Bonne fête aux Marcel !
+01/16	Aujourd'hui, c'est la St(e) Marcelle.
+01/16	N'oubliez pas les Marceau !
+01/16	Bonne fête aux Honorat !
+01/17	Aujourd'hui, c'est la St(e) Roseline.
+01/17	N'oubliez pas les Antoine !
+01/17	Bonne fête aux Anthony !
+01/18	Aujourd'hui, c'est la St(e) Prisca.
+01/18	N'oubliez pas les Libert !
+01/19	Bonne fête aux Marius !
+01/19	Aujourd'hui, c'est la St(e) Canut.
+01/20	N'oubliez pas les Fabienne !
+01/20	Bonne fête aux Sébastien !
+01/20	Aujourd'hui, c'est la St(e) Bastien.
+01/21	N'oubliez pas les Agnès !
+01/21	Bonne fête aux Fructueux !
+01/21	Aujourd'hui, c'est la St(e) Augure.
+01/21	N'oubliez pas les Euloge !
+01/21	Bonne fête aux Avit !
+01/22	Aujourd'hui, c'est la St(e) Vincent.
+01/22	N'oubliez pas les Blésille !
+01/23	Bonne fête aux Barnard !
+01/24	Aujourd'hui, c'est la St(e) François.
+01/25	N'oubliez pas les Morgane !
+01/26	Bonne fête aux Paule !
+01/26	Aujourd'hui, c'est la St(e) Timothée.
+01/26	N'oubliez pas les Tite !
+01/27	Bonne fête aux Angèle !
+01/28	Aujourd'hui, c'est la St(e) Thomas.
+01/29	N'oubliez pas les Gildas !
+01/29	Bonne fête aux Sulpice !
+01/30	Aujourd'hui, c'est la St(e) Martine.
+01/31	N'oubliez pas les Marcelle !
+01/31	Bonne fête aux Jean !
+02/01	Aujourd'hui, c'est la St(e) Ella.
+02/01	N'oubliez pas les Viridiane !
+02/02	Bonne fête aux Théophane !
+02/03	Aujourd'hui, c'est la St(e) Blaise.
+02/03	N'oubliez pas les Anschaire !
+02/04	Bonne fête aux Véronique !
+02/04	Aujourd'hui, c'est la St(e) Jeanne.
+02/04	N'oubliez pas les Gilbert !
+02/05	Bonne fête aux Agathe !
+02/06	Aujourd'hui, c'est la St(e) Gaston.
+02/06	N'oubliez pas les Armand !
+02/07	Bonne fête aux Eugénie !
+02/07	Aujourd'hui, c'est la St(e) Partène.
+02/08	N'oubliez pas les Jacqueline !
+02/08	Bonne fête aux Jérôme !
+02/09	Aujourd'hui, c'est la St(e) Apolline.
+02/09	N'oubliez pas les Appollonie !
+02/10	Bonne fête aux Arnaud !
+02/10	Aujourd'hui, c'est la St(e) Scholastique.
+02/11	N'oubliez pas les Séverin !
+02/11	Bonne fête aux Séverine !
+02/12	Aujourd'hui, c'est la St(e) Félix.
+02/12	N'oubliez pas les Eulalie !
+02/13	Bonne fête aux Béatrice !
+02/13	Aujourd'hui, c'est la St(e) Polyeucte.
+02/14	N'oubliez pas les Valentin !
+02/14	Bonne fête aux Méthode !
+02/14	Aujourd'hui, c'est la St(e) Cyrille.
+02/15	N'oubliez pas les Claude !
+02/15	Bonne fête aux Georgette !
+02/16	Aujourd'hui, c'est la St(e) Julienne.
+02/17	N'oubliez pas les Alexis !
+02/18	Bonne fête aux Bernadette et aux Nadine !
+02/19	Aujourd'hui, c'est la St(e) Gabin.
+02/20	N'oubliez pas les Aimée !
+02/20	Bonne fête aux Aimé !
+02/20	Aujourd'hui, c'est la St(e) Amata.
+02/21	N'oubliez pas les Pierre-Damien !
+02/22	Bonne fête aux Isabelle !
+02/23	Aujourd'hui, c'est la St(e) Lazare.
+02/23	N'oubliez pas les Polycarpe !
+02/24	Bonne fête aux Modeste !
+02/25	Aujourd'hui, c'est la St(e) Roméo.
+02/25	N'oubliez pas les Avertan !
+02/26	Bonne fête aux Nestor !
+02/27	Aujourd'hui, c'est la St(e) Honorine.
+02/27	N'oubliez pas les Gabriel !
+02/28	Bonne fête aux Romain !
+02/28	Aujourd'hui, c'est la St(e) Lupicin.
+02/29	N'oubliez pas les Auguste !
+03/01	Bonne fête aux Aubin !
+03/01	Aujourd'hui, c'est la St(e) Albin.
+03/02	N'oubliez pas les Charles !
+03/03	Bonne fête aux Guénolé (Gwénolé) !
+03/04	Aujourd'hui, c'est la St(e) Casimir.
+03/05	N'oubliez pas les Olive !
+03/05	Bonne fête aux Olivia !
+03/06	Aujourd'hui, c'est la St(e) Colette.
+03/06	N'oubliez pas les Nicole !
+03/07	Bonne fête aux Félicité !
+03/07	Aujourd'hui, c'est la St(e) Félicie.
+03/07	N'oubliez pas les Perpétue !
+03/08	Bonne fête aux Jean !
+03/09	Aujourd'hui, c'est la St(e) Françoise.
+03/10	N'oubliez pas les Vivien !
+03/10	Bonne fête aux Dominique !
+03/11	Aujourd'hui, c'est la St(e) Rosine.
+03/12	N'oubliez pas les Justine !
+03/12	Bonne fête aux Maximilien !
+03/13	Aujourd'hui, c'est la St(e) Rodrigue.
+03/13	N'oubliez pas les Salomon !
+03/13	Bonne fête aux Euphrasie !
+03/14	Aujourd'hui, c'est la St(e) Mathilde.
+03/15	N'oubliez pas les Louise !
+03/16	Bonne fête aux Bénédicte !
+03/16	Aujourd'hui, c'est la St(e) Benoîte.
+03/16	N'oubliez pas les Julien !
+03/17	C'est la St Patrick !
+03/17	Aujourd'hui, c'est la St(e) Patrice.
+03/18	N'oubliez pas les Cyrille !
+03/19	Bonne fête aux Joseph !
+03/20	Aujourd'hui, c'est la St(e) Herbert.
+03/20	N'oubliez pas les Wulfran !
+03/21	Bonne fête aux Clémence !
+03/22	Aujourd'hui, c'est la St(e) Léa.
+03/23	N'oubliez pas les Victorien !
+03/23	Bonne fête aux Turibio !
+03/24	Aujourd'hui, c'est la St(e) Catherine.
+03/24	N'oubliez pas les Karine !
+03/26	Bonne fête aux Lara !
+03/26	Aujourd'hui, c'est la St(e) Ludger.
+03/26	N'oubliez pas les Larissa !
+03/27	Bonne fête aux Habib !
+03/28	Aujourd'hui, c'est la St(e) Gontran.
+03/29	N'oubliez pas les Gwladys !
+03/29	Bonne fête aux Eustase !
+03/30	Aujourd'hui, c'est la St(e) Amédée.
+03/31	N'oubliez pas les Benjamin !
+03/31	Bonne fête aux Benjamine !
+04/01	Votre fichier calendar est corrompu.
+04/01	N'oubliez pas les Hugues !
+04/02	Bonne fête aux Sandrine !
+04/03	Aujourd'hui, c'est la St(e) Richard.
+04/04	N'oubliez pas les Isidore !
+04/04	Bonne fête aux Benoît !
+04/05	Aujourd'hui, c'est la St(e) Irène.
+04/05	N'oubliez pas les Vincent !
+04/06	Bonne fête aux Marcellin !
+04/06	Aujourd'hui, c'est la St(e) Célestin.
+04/06	N'oubliez pas les Guillaume !
+04/07	Bonne fête aux Jean-Baptiste !
+04/07	Aujourd'hui, c'est la St(e) Julienne.
+04/08	N'oubliez pas les Perpet !
+04/08	Bonne fête aux Perpetuus !
+04/09	Aujourd'hui, c'est la St(e) Gautier.
+04/09	N'oubliez pas les Jean !
+04/10	Bonne fête aux Fulbert !
+04/10	Aujourd'hui, c'est la St(e) Michel.
+04/11	N'oubliez pas les Stanislas !
+04/11	Bonne fête aux Gemma !
+04/11	Aujourd'hui, c'est la St(e) Léon.
+04/12	N'oubliez pas les Jules !
+04/12	Bonne fête aux Sabas !
+04/13	Aujourd'hui, c'est la St(e) Ida.
+04/13	N'oubliez pas les Herménégilde !
+04/14	Bonne fête aux Maxime !
+04/14	Aujourd'hui, c'est la St(e) Lydwine.
+04/14	N'oubliez pas les Bénézet !
+04/15	Bonne fête aux Pierre !
+04/16	Aujourd'hui, c'est la St(e) Benoît.
+04/17	N'oubliez pas les Anicet !
+04/17	Bonne fête aux Kateri !
+04/18	Aujourd'hui, c'est la St(e) Parfait.
+04/19	N'oubliez pas les Emma !
+04/19	Bonne fête aux Elphège !
+04/20	Aujourd'hui, c'est la St(e) Odette.
+04/20	N'oubliez pas les Agnès !
+04/21	Bonne fête aux Anselme !
+04/22	Aujourd'hui, c'est la St(e) Alexandre.
+04/22	N'oubliez pas les Soter !
+04/22	Bonne fête aux Caïus !
+04/22	Aujourd'hui, c'est la St(e) Léonide.
+04/23	N'oubliez pas les Georges !
+04/23	Bonne fête aux Pierre !
+04/24	Aujourd'hui, c'est la St(e) Fidèle.
+04/24	N'oubliez pas les Marie-Euphrasie !
+04/25	Bonne fête aux Marc !
+04/26	Aujourd'hui, c'est la St(e) Alida.
+04/27	N'oubliez pas les Zita !
+04/27	Bonne fête aux Pierre !
+04/28	Aujourd'hui, c'est la St(e) Valérie.
+04/28	N'oubliez pas les Louis-Marie !
+04/28	Bonne fête aux Paul !
+04/29	Aujourd'hui, c'est la St(e) Joseph-Benoît.
+04/29	N'oubliez pas les Hugues !
+04/30	Bonne fête aux Robert !
+04/30	Aujourd'hui, c'est la St(e) Catherine.
+05/02	N'oubliez pas les Boris !
+05/03	Bonne fête aux Jacques !
+05/03	Aujourd'hui, c'est la St(e) Philippe.
+05/04	N'oubliez pas les Sylvain !
+05/05	Bonne fête aux Judith !
+05/06	Aujourd'hui, c'est la St(e) Prudence.
+05/07	N'oubliez pas les Gisèle !
+05/09	Bonne fête aux Pacôme !
+05/10	Aujourd'hui, c'est la St(e) Solange.
+05/11	N'oubliez pas les Estelle !
+05/12	Bonne fête aux Achille !
+05/14	Aujourd'hui, c'est la St(e) Matthias.
+05/15	N'oubliez pas les Denise !
+05/16	Bonne fête aux Honoré !
+05/17	Aujourd'hui, c'est la St(e) Pascal.
+05/18	N'oubliez pas les Éric !
+05/19	Bonne fête aux Yves !
+05/19	Aujourd'hui, c'est la St(e) Yvonne.
+05/20	N'oubliez pas les Bernardin !
+05/21	Bonne fête aux Constantin !
+05/22	Aujourd'hui, c'est la St(e) Émile.
+05/23	N'oubliez pas les Didier !
+05/24	Bonne fête aux Donatien !
+05/25	Aujourd'hui, c'est la St(e) Sophie.
+05/26	N'oubliez pas les Bérenger !
+05/28	Bonne fête aux Germain !
+05/29	Aujourd'hui, c'est la St(e) Aymard.
+05/30	N'oubliez pas les Ferdinand !
+06/01	Bonne fête aux Justin !
+06/02	Aujourd'hui, c'est la St(e) Blandine.
+06/03	N'oubliez pas les Kévin !
+06/04	Bonne fête aux Clotilde !
+06/05	Aujourd'hui, c'est la St(e) Igor.
+06/06	N'oubliez pas les Norbert !
+06/07	Bonne fête aux Gilbert !
+06/08	Aujourd'hui, c'est la St(e) Médard.
+06/09	N'oubliez pas les Diane !
+06/11	Bonne fête aux Barnabé !
+06/11	Aujourd'hui, c'est la St(e) Yolande.
+06/12	N'oubliez pas les Guy !
+06/13	Bonne fête aux Antoine !
+06/14	Aujourd'hui, c'est la St(e) Élisée.
+06/15	N'oubliez pas les Germaine !
+06/16	Bonne fête aux Jean-François !
+06/17	Aujourd'hui, c'est la St(e) Hervé.
+06/18	N'oubliez pas les Léonce !
+06/19	Bonne fête aux Romuald !
+06/20	Aujourd'hui, c'est la St(e) Silvère.
+06/21	N'oubliez pas les Rodolphe !
+06/22	Bonne fête aux Alban !
+06/23	Aujourd'hui, c'est la St(e) Audrey.
+06/24	N'oubliez pas les Jean-Baptiste !
+06/25	Bonne fête aux Prosper !
+06/26	Aujourd'hui, c'est la St(e) Anthelme.
+06/27	N'oubliez pas les Fernand !
+06/28	Bonne fête aux Irénée !
+06/29	Aujourd'hui, c'est la St(e) Paul.
+06/29	N'oubliez pas les Pierre !
+06/30	Bonne fête aux Martial !
+07/01	Aujourd'hui, c'est la St(e) Thierry.
+07/02	N'oubliez pas les Martinien !
+07/03	Bonne fête aux Thomas !
+07/04	Aujourd'hui, c'est la St(e) Florent.
+07/05	N'oubliez pas les Antoine !
+07/06	Bonne fête aux Mariette !
+07/07	Aujourd'hui, c'est la St(e) Raoul.
+07/08	N'oubliez pas les Thibaut !
+07/09	Bonne fête aux Amandine !
+07/10	Aujourd'hui, c'est la St(e) Ulrich.
+07/11	N'oubliez pas les Benoît !
+07/12	Bonne fête aux Olivier !
+07/13	Aujourd'hui, c'est la St(e) Henri.
+07/13	N'oubliez pas les Joël !
+07/14	Bonne fête aux Camille !
+07/15	Aujourd'hui, c'est la St(e) Donald.
+07/17	N'oubliez pas les Caroline !
+07/17	Bonne fête aux Charlotte !
+07/18	Aujourd'hui, c'est la St(e) Frédéric.
+07/19	N'oubliez pas les Arsène !
+07/20	Bonne fête aux Marina !
+07/21	Aujourd'hui, c'est la St(e) Victor.
+07/22	N'oubliez pas les Marie-Madeleine !
+07/23	Bonne fête aux Brigitte !
+07/24	Aujourd'hui, c'est la St(e) Christine.
+07/25	N'oubliez pas les Jacques !
+07/26	Bonne fête aux Anne !
+07/26	Aujourd'hui, c'est la St(e) Joachim.
+07/27	N'oubliez pas les Nathalie !
+07/28	Bonne fête aux Samson !
+07/29	Aujourd'hui, c'est la St(e) Marthe.
+07/30	N'oubliez pas les Juliette !
+07/31	Bonne fête aux Ignace !
+08/01	Aujourd'hui, c'est la St(e) Alphonse.
+08/01	N'oubliez pas les Pierre !
+08/02	Bonne fête aux Julien !
+08/03	Aujourd'hui, c'est la St(e) Lydie.
+08/03	N'oubliez pas les Pierre-Julien !
+08/04	Bonne fête aux Jean-Marie !
+08/04	Aujourd'hui, c'est la St(e) Dominique.
+08/05	N'oubliez pas les Abel !
+08/05	Bonne fête aux Oswald !
+08/07	Aujourd'hui, c'est la St(e) Gaëtan.
+08/08	N'oubliez pas les Dominique !
+08/08	Bonne fête aux Cyriaque !
+08/09	Aujourd'hui, c'est la St(e) Amour.
+08/10	N'oubliez pas les Laurent !
+08/11	Bonne fête aux Claire !
+08/11	Aujourd'hui, c'est la St(e) Philomène.
+08/12	N'oubliez pas les Clarisse !
+08/13	Bonne fête aux Hyppolite !
+08/13	Aujourd'hui, c'est la St(e) Radegonde.
+08/14	N'oubliez pas les Évrard !
+08/14	Bonne fête aux Maximilien !
+08/15	Aujourd'hui, c'est la St(e) Marie.
+08/16	N'oubliez pas les Armel !
+08/16	Bonne fête aux Roch !
+08/17	Aujourd'hui, c'est la St(e) Hyacinthe.
+08/18	N'oubliez pas les Hélène !
+08/19	Bonne fête aux Jean-Eudes !
+08/19	Aujourd'hui, c'est la St(e) Louis.
+08/20	N'oubliez pas les Bernard !
+08/21	Bonne fête aux Christophe !
+08/21	Aujourd'hui, c'est la St(e) Jeanne.
+08/22	N'oubliez pas les Fabrice !
+08/22	Bonne fête aux Symphorien !
+08/23	Aujourd'hui, c'est la St(e) Rose.
+08/23	N'oubliez pas les Philippe !
+08/24	Bonne fête aux Barthélémy !
+08/25	Aujourd'hui, c'est la St(e) Louis.
+08/26	N'oubliez pas les Natacha !
+08/26	Bonne fête aux Zéphirin !
+08/26	Aujourd'hui, c'est la St(e) Eulade.
+08/27	N'oubliez pas les Edwige !
+08/27	Bonne fête aux Joseph !
+08/28	Aujourd'hui, c'est la St(e) Augustin.
+08/29	N'oubliez pas les Sabine !
+08/30	Bonne fête aux Fiacre !
+08/30	Aujourd'hui, c'est la St(e) Rose.
+08/31	N'oubliez pas les Aristide !
+08/31	Bonne fête aux Raymond !
+09/01	Aujourd'hui, c'est la St(e) Gilles.
+09/02	N'oubliez pas les Ingrid !
+09/03	Bonne fête aux Grégoire !
+09/04	Aujourd'hui, c'est la St(e) Rosalie.
+09/05	N'oubliez pas les Raïssa !
+09/06	Bonne fête aux Bertrand !
+09/07	Aujourd'hui, c'est la St(e) Reine.
+09/09	N'oubliez pas les Alain !
+09/10	Bonne fête aux Inès !
+09/11	Aujourd'hui, c'est la St(e) Adelphe.
+09/12	N'oubliez pas les Apollinaire !
+09/13	Bonne fête aux Aimé !
+09/15	Aujourd'hui, c'est la St(e) Roland.
+09/16	N'oubliez pas les Édith !
+09/17	Bonne fête aux Renaud !
+09/18	Aujourd'hui, c'est la St(e) Nadège.
+09/19	N'oubliez pas les Émilie !
+09/20	Bonne fête aux Davy !
+09/21	Aujourd'hui, c'est la St(e) Matthieu.
+09/22	N'oubliez pas les Maurice !
+09/23	Bonne fête aux Constant !
+09/24	Aujourd'hui, c'est la St(e) Thècle.
+09/25	N'oubliez pas les Hermann !
+09/26	Bonne fête aux Côme !
+09/26	Aujourd'hui, c'est la St(e) Damien.
+09/27	N'oubliez pas les Vincent !
+09/28	Bonne fête aux Venceslas !
+09/29	Aujourd'hui, c'est la St(e) Michel.
+09/29	N'oubliez pas les Raphaël !
+09/30	Bonne fête aux Jérôme !
+10/01	Aujourd'hui, c'est la St(e) Thérèse.
+10/02	N'oubliez pas les Léger !
+10/03	Bonne fête aux Gérard !
+10/04	Aujourd'hui, c'est la St(e) François.
+10/05	N'oubliez pas les Placide !
+10/05	Bonne fête aux Fleur !
+10/05	Aujourd'hui, c'est la St(e) Flore.
+10/05	N'oubliez pas les Pâquerette !
+10/05	Bonne fête aux Violette !
+10/05	Aujourd'hui, c'est la St(e) Pervenche.
+10/05	N'oubliez pas les Anémone !
+10/05	Bonne fête aux Bluette !
+10/05	Aujourd'hui, c'est la St(e) Capucine.
+10/05	N'oubliez pas les Dahlia !
+10/05	Bonne fête aux Myrtille !
+10/05	Aujourd'hui, c'est la St(e) Hortense.
+10/05	N'oubliez pas les Violaine !
+10/05	Bonne fête aux Anne-Aymone !
+10/05	Aujourd'hui, c'est la St(e) Dalie.
+10/06	N'oubliez pas les Bruno !
+10/06	Bonne fête aux Foy !
+10/07	Aujourd'hui, c'est la St(e) Serge.
+10/08	N'oubliez pas les Pélagie !
+10/09	Aujourd'hui, c'est la St(e) Denis.
+10/09	N'oubliez pas les Denys !
+10/10	Bonne fête aux Ghislain !
+10/10	Aujourd'hui, c'est la St(e) Ghislaine.
+10/10	N'oubliez pas les Guislain !
+10/10	Bonne fête aux Guislaine !
+10/11	Aujourd'hui, c'est la St(e) Firmin.
+10/11	N'oubliez pas les Gausbert !
+10/12	Bonne fête aux Wilfried !
+10/12	Aujourd'hui, c'est la St(e) Séraphin.
+10/13	N'oubliez pas les Géraud !
+10/14	Bonne fête aux Juste !
+10/14	Aujourd'hui, c'est la St(e) Calliste.
+10/15	N'oubliez pas les Thérèse !
+10/16	Bonne fête aux Edwige !
+10/16	Aujourd'hui, c'est la St(e) Marie-Marguerite.
+10/17	N'oubliez pas les Baudoin !
+10/17	Bonne fête aux Ignace !
+10/18	Aujourd'hui, c'est la St(e) Luc.
+10/19	N'oubliez pas les René !
+10/20	Bonne fête aux Adeline !
+10/20	Aujourd'hui, c'est la St(e) Aline.
+10/20	N'oubliez pas les Line !
+10/21	Bonne fête aux Céline !
+10/21	Aujourd'hui, c'est la St(e) Hilarion.
+10/22	N'oubliez pas les Élodie !
+10/22	Bonne fête aux Nunillon !
+10/22	Aujourd'hui, c'est la St(e) Salomé.
+10/23	N'oubliez pas les Jean !
+10/24	Bonne fête aux Florentin !
+10/25	Aujourd'hui, c'est la St(e) Crépin.
+10/25	N'oubliez pas les Crépinien !
+10/25	Bonne fête aux Chrysanthe !
+10/25	Aujourd'hui, c'est la St(e) Darie.
+10/25	N'oubliez pas les Enguerran !
+10/26	Bonne fête aux Dimitri !
+10/26	Aujourd'hui, c'est la St(e) Évariste.
+10/27	N'oubliez pas les Émeline !
+10/27	Bonne fête aux Didier !
+10/27	Aujourd'hui, c'est la St(e) Frumence.
+10/28	N'oubliez pas les Jude !
+10/28	Bonne fête aux Judas !
+10/28	Aujourd'hui, c'est la St(e) Thaddée.
+10/28	N'oubliez pas les Simon !
+10/28	Bonne fête aux Simone (Simonne) !
+10/29	Aujourd'hui, c'est la St(e) Narcisse.
+10/30	N'oubliez pas les Bienvenue !
+10/30	Bonne fête aux Dorothée !
+10/31	Aujourd'hui, c'est la St(e) Quentin.
+10/31	N'oubliez pas les Alphonse !
+10/31	Bonne fête aux Wolfgang !
+11/02	Aujourd'hui, c'est la St(e) Défunts.
+11/03	N'oubliez pas les Hubert !
+11/04	Bonne fête aux Charles !
+11/04	Aujourd'hui, c'est la St(e) Amans !
+11/05	N'oubliez pas les Sylvie.
+11/05	Bonne fête aux Sylvette !
+11/05	Aujourd'hui, c'est la St(e) Sylviane !
+11/05	N'oubliez pas les Zacharie.
+11/05	Bonne fête aux Élisabeth !
+11/06	Aujourd'hui, c'est la St(e) Bertille !
+11/06	N'oubliez pas les Léonard.
+11/06	Bonne fête aux Winnoc !
+11/07	Aujourd'hui, c'est la St(e) Carine !
+11/07	N'oubliez pas les Karine.
+11/07	Bonne fête aux Ernest !
+11/07	Aujourd'hui, c'est la St(e) Ernst !
+11/07	N'oubliez pas les Willibrord.
+11/08	Bonne fête aux Geoffroy !
+11/09	Aujourd'hui, c'est la St(e) Théodore !
+11/10	N'oubliez pas les Léon.
+11/10	Bonne fête aux Léontine !
+11/10	Aujourd'hui, c'est la St(e) Lionel !
+11/11	N'oubliez pas les Martin.
+11/12	Bonne fête aux Christian !
+11/12	Aujourd'hui, c'est la St(e) Josaphat !
+11/13	N'oubliez pas les Brice.
+11/13	Bonne fête aux Diégo !
+11/13	Aujourd'hui, c'est la St(e) Didace !
+11/14	N'oubliez pas les Sidoine.
+11/14	Bonne fête aux Sidonie !
+11/14	Aujourd'hui, c'est la St(e) Sérapion !
+11/15	N'oubliez pas les Albert.
+11/16	Bonne fête aux Marguerite !
+11/16	Aujourd'hui, c'est la St(e) Gertrude !
+11/17	N'oubliez pas les Élisabeth.
+11/17	Bonne fête aux Élise !
+11/17	Aujourd'hui, c'est la St(e) Lise !
+11/18	N'oubliez pas les Aude.
+11/19	Bonne fête aux Tanguy !
+11/19	Aujourd'hui, c'est la St(e) Tanneguy !
+11/19	N'oubliez pas les Mechtilde.
+11/19	Bonne fête aux Mathilde !
+11/19	Aujourd'hui, c'est la St(e) Patrocle !
+11/20	N'oubliez pas les Edmond.
+11/20	Bonne fête aux Octave !
+11/20	Aujourd'hui, c'est la St(e) Adventor !
+11/20	N'oubliez pas les Solutor.
+11/20	Bonne fête aux Ambroise !
+11/20	Aujourd'hui, c'est la St(e) Rutus !
+11/22	N'oubliez pas les Cécile.
+11/22	Bonne fête aux Célia !
+11/23	Aujourd'hui, c'est la St(e) Clément !
+11/23	N'oubliez pas les Clémentine.
+11/23	Bonne fête aux Colomban !
+11/24	Aujourd'hui, c'est la St(e) Augusta !
+11/24	N'oubliez pas les Flora.
+11/25	Bonne fête aux Catherine !
+11/24	Aujourd'hui, c'est la St(e) Maria !
+11/26	N'oubliez pas les Delphine.
+11/26	Bonne fête aux Elzéar !
+11/27	Aujourd'hui, c'est la St(e) Séverin !
+11/27	N'oubliez pas les Séverine.
+11/27	Bonne fête aux Maxime !
+11/28	Aujourd'hui, c'est la St(e) Jacques !
+11/29	N'oubliez pas les Saturnin.
+11/29	Bonne fête aux Sernin (Cernin) !
+11/29	Aujourd'hui, c'est la St(e) Savourin !
+11/29	N'oubliez pas les Sornin.
+11/30	Bonne fête aux André !
+11/30	Aujourd'hui, c'est la St(e) Andréa !
+12/01	N'oubliez pas les Florence.
+12/01	Bonne fête aux Éloi !
+12/01	Aujourd'hui, c'est la St(e) Airy !
+12/02	N'oubliez pas les Viviane.
+12/03	Bonne fête aux François-Xavier !
+12/03	Aujourd'hui, c'est la St(e) Xavier !
+12/03	N'oubliez pas les Eugène.
+12/04	Bonne fête aux Barbara !
+12/04	Aujourd'hui, c'est la St(e) Barbe !
+12/05	N'oubliez pas les Gérald.
+12/05	Bonne fête aux Géraldine !
+12/05	Aujourd'hui, c'est la St(e) Géraud !
+12/05	N'oubliez pas les Sabas.
+12/06	Bonne fête aux Nicolas !
+12/07	Aujourd'hui, c'est la St(e) Ambroise !
+12/09	N'oubliez pas les Pierre.
+12/10	Bonne fête aux Romaric !
+12/10	Aujourd'hui, c'est la St(e) Eulalie !
+12/10	N'oubliez pas les Melchaide.
+12/10	Bonne fête aux Miltiade !
+12/11	Aujourd'hui, c'est la St(e) Daniel !
+12/11	N'oubliez pas les Damase.
+12/12	Bonne fête aux Chantal !
+12/13	Aujourd'hui, c'est la St(e) Lucie !
+12/13	N'oubliez pas les Rolande.
+12/13	Bonne fête aux Aurore !
+12/14	Aujourd'hui, c'est la St(e) Odile !
+12/15	N'oubliez pas les Ninon.
+12/15	Bonne fête aux Nina !
+12/15	Aujourd'hui, c'est la St(e) Christiane !
+12/15	N'oubliez pas les Christina.
+12/16	Bonne fête aux Alice !
+12/16	Aujourd'hui, c'est la St(e) Adélaïde !
+12/16	N'oubliez pas les Évrard.
+12/16	Bonne fête aux Éberhard !
+12/17	Aujourd'hui, c'est la St(e) Gaël !
+12/17	N'oubliez pas les Lazare.
+12/17	Bonne fête aux Olympe !
+12/17	Aujourd'hui, c'est la St(e) Olympias !
+12/17	N'oubliez pas les Judicaël.
+12/18	Bonne fête aux Gatien !
+12/18	Aujourd'hui, c'est la St(e) Winebald !
+12/19	N'oubliez pas les Urbain.
+12/20	Bonne fête aux Abraham !
+12/20	Aujourd'hui, c'est la St(e) Théophile !
+12/21	N'oubliez pas les Pierre.
+12/22	Bonne fête aux Françoise-Xavière !
+12/22	Aujourd'hui, c'est la St(e) Flavien !
+12/23	N'oubliez pas les Armand.
+12/24	Bonne fête aux Adèle !
+12/24	Aujourd'hui, c'est la St(e) Charbel !
+12/25	N'oubliez pas les Emmanuel.
+12/25	Bonne fête aux Emmanuelle !
+12/25	Aujourd'hui, c'est la St(e) Noël !
+12/26	N'oubliez pas les Étienne.
+12/26	Bonne fête aux Stéphane !
+12/26	Aujourd'hui, c'est la St(e) Stéphanie !
+12/27	N'oubliez pas les Jean.
+12/27	Bonne fête aux Yann !
+12/28	Aujourd'hui, c'est la St(e) Innocents !
+12/29	N'oubliez pas les David.
+12/30	Bonne fête aux Roger !
+12/31	Aujourd'hui, c'est la St(e) Sylvestre !
+
+#endif /*! _fr_FR_ISO8859_1_fetes */
diff --git a/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
new file mode 100644
index 0000000..b32b5ae
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french
@@ -0,0 +1,12 @@
+/*	$OpenBSD: calendar.french,v 1.2 2004/01/16 18:43:28 mickey Exp $	*/
+
+/*
+ * French calendar file(s)
+ */
+
+#ifndef _calendar_french_
+#define _calendar_french_
+
+#include <fr_FR.ISO8859-1/calendar.all>
+
+#endif /* !_calendar_french_ */
diff --git a/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
new file mode 100644
index 0000000..9d9550c
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies
@@ -0,0 +1,45 @@
+/*	$OpenBSD: calendar.jferies,v 1.3 2006/05/15 15:24:19 aanriot Exp $	*/
+
+/*
+ * Jours fériés
+ */
+
+#ifndef _fr_FR_ISO8859_1_jferies_
+#define _fr_FR_ISO8859_1_jferies_
+
+LANG=fr_FR.ISO8859-1
+
+/* Jours chômés */
+01/01	Nouvel an
+05/01	Fête du travail
+05/08	Armistice 1945
+07/14	Fête nationale française
+11/11	Armistice 1918
+
+/* Jours fériés religieux */
+Easter		Pâques
+Easter+1 	Lundi de Pâques
+Easter+39	Ascension
+Easter+49	Pentecôte
+Easter+50	Lundi de Pentecôte
+08/15		Assomption
+11/01		Toussaint
+12/25		Noël
+
+/* Les dates suivantes ne sont malheureusement pas fériées... */
+
+/* Saisons */
+03/21*	Printemps
+06/21*	Été
+09/21*	Automne
+12/21*	Hiver
+
+/* Changements d'heure */
+03/SundayLast	Passage à l'heure d'été
+10/SundayLast	Passage à l'heure d'hiver
+
+/* Divers */
+05/SundayLast	Fêtes des mères
+June Sun+3	Fêtes des pères
+
+#endif /*! _fr_FR_ISO8859_1_jferies_ */
diff --git a/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
new file mode 100644
index 0000000..9221123
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes
@@ -0,0 +1,354 @@
+/*	$OpenBSD: calendar.proverbes,v 1.2 2004/01/16 18:43:28 mickey Exp $	*/
+
+/*
+ * Proverbes liés au calendrier
+ */
+
+#ifndef _fr_FR_ISO8859_1_proverbes_
+#define _fr_FR_ISO8859_1_proverbes_
+
+LANG=fr_FR.ISO8859-1
+
+/* Janvier */
+01/01	Calme et claire nuit de l'an
+	À bonne année donne l'élan.
+01/02	Janvier d'eau chiche
+	Fait le paysan riche.
+01/04	Un mois de janvier sans gelée
+	N'amène jamais une bonne année.
+01/06	Pluie aux Rois,
+	Blé jusqu'au toit.
+01/08	Janvier sec et sage
+	Est un bon présage.
+01/09	Saint Julien brise la glace ;
+	S'il ne la brise, c'est qu'il l'embrasse.
+01/10	Beau temps à la saint Guillaume
+	Donne plus de blé que de chaume.
+01/13	Soleil au jour de saint Hilaire,
+	Fends du bois pour ton hiver.
+01/14	Pingouin dans les champs,
+	Hiver méchant.
+01/15	S'il gèle à la saint Maur,
+	La moitié de l'hiver est dehors.
+01/18	À la saint Pierre,
+	L'hiver s'en va ou se resserre.
+01/20	S'il gèle à la saint Sébastien,
+	L'hiver s'en va ou revient.
+01/22	Pour saint Vincent,
+	L'hiver perd ses dents
+	Ou les retrouve pour longtemps.
+01/24	S'il tonne en janvier,
+	Monte les barriques au grenier.
+01/25	Le jour de saint Paul,
+	L'hiver se rompt le col.
+01/31	Janvier fait le péché,
+	Mars en est accusé.
+
+/* Février */
+02/01	À la saint Ignace,
+	L'eau est de glace.
+02/02	Chandeleur claire, hiver derrière ;
+	Chandeleur trouble, hiver redouble.
+02/03	À la saint Blaise,
+	L'hiver s'apaise,
+	Mais s'il redouble et s'il reprend,
+	Longtemps après on s'en ressent.
+02/05	Pour la sainte Agathe, sème ton oignon,
+	Fût-il dans la glace, il deviendra bon.
+02/09	À la sainte Apolline
+	Bien souvent l'hiver nous quitte.
+02/12	Si le soleil rit à la sainte Eulalie,
+	Pommes et cidre à la folie.
+02/14	À la saint Valentin,
+	Tous les vents sont marins.
+02/16	Pluie de février
+	À la terre vaut du fumier.
+02/18	Février trop doux,
+	Printemps en courroux.
+02/20	La neige de février
+	Brûle le blé.
+02/22	Neige à la sainte Isabelle
+	Fait la fleur plus belle.
+02/24	Saint Mathias
+	Casse la glace ;
+	S'il n'y en a pas,
+	Il en fera.
+02/27	Gelée de la sainte Honorine
+	Rend toute la vallée chagrine.
+02/28	Fleur de février
+	Va mal au pommier.
+
+/* Mars */
+03/01	Taille à la saint Aubin
+	Donnera de gros raisins.
+03/02	Quand mars mouillera,
+	Bien du vin tu auras.
+03/03	Soit au début, soit à la fin,
+	Mars nous montre son venin.
+03/06	À la sainte Colette
+	Commence à chanter l'alouette.
+03/08	Quand en mars il tonne,
+	L'année sera bonne.
+03/10	Mars venteux,
+	Vergers pommeux.
+03/12	À la saint Grégoire,
+	Il faut tailler la vigne pour boire.
+03/13	Poussière de mars
+	Est poussière d'or...
+03/15	Pluie de mars grandit l'herbette
+	Et souvent annonce disette.
+03/17	S'il fait doux à la saint Patrice,
+	De leurs trous sortent les écrevisses.
+03/19	Pour saint Joseph,
+	L'hirondelle va et vient.
+03/21	S'il pleut à la saint Benoît,
+	Il pleut trente-sept jours plus trois.
+03/23	Quand à glace il gèle à la saint Victorien,
+	En pêches et en abricots il n'y a rien.
+03/25	Quand fleurs en mars il y aura,
+	Guère de fruits ne mangeras.
+03/28	À la saint Gontran, si la température est belle,
+	Arrivent les premières hirondelles.
+03/30	Quand mars se déguise en été,
+	Avril prend ses habits fourrés.
+03/31	À la saint Benjamin,
+	Le mauvais temps prend fin.
+
+/* Mobiles */
+Easter-7	Le propre jour des Rameaux
+	Sème oignons et poireaux.
+Easter-3	La gelée du jeudi saint
+	Gèle le sarrasin.
+Easter-2	Gelée du vendredi saint
+	Gèle le pain et le vin.
+Easter	S'il pleut à Pâques,
+	Il pleut pendant quarante jours.
+Easter	Pâques en mars,
+	Pestes, guerres ou famines.
+Easter+36	Haricots de rogations
+	Rendent à foison.
+Easter+37	Belles rogations,
+	Belles moissons.
+Easter+39	S'il pleut à l'Ascension,
+	Tout va en perdition.
+Easter+49	La Pentecôte
+	Donne les fruits, ou les ôte.
+Easter+56	S'il pleut à la Trinité,
+	Il pleut tous les jours de l'année.
+
+/* Avril */
+04/01	Avril entrant,
+	Coucou chantant,
+	Sonnailles tintant.
+04/05	Avril fait la fleur,
+	Mai en a l'honneur.
+04/10	Il n'est point d'avril si beau
+	Qu'il n'ait de neige à son chapeau.
+04/15	En avril, ne te découvre pas d'un fil ;
+	En mai, fais ce qu'il te plaît ;
+	En juin, de trois habits n'en garde qu'un.
+04/17	Orage en avril,
+	Prépare tes barrils.
+04/19	À la sainte Léonide
+	Chaque blé pousse rapide.
+04/22	Pluie à la sainte Opportune,
+	Ni cerises ni prunes.
+04/23	À la saint Georges,
+	Sème ton orge,
+	À la saint Marc,
+	Il est trop tard.
+04/25	À la saint Marc, s'il tombe de l'eau,
+	Il n'y aura pas de fruits à couteau.
+04/28	Avril pluvieux et mai venteux
+	Ne rendent pas le paysan disetteux.
+04/30	La pluie à la saint Robert
+	De bon vin emplira ton verre.
+
+/* Mai */
+05/03	Les trois saints au sang de navet,
+	Pancrace, Mamert et Servais,
+	Sont bien nommés les saints de glace,
+	Mamert, Servais et Pancrace.
+05/15	À la sainte Denise,
+	Le froid n'en fait plus à sa guise.
+05/16	À la saint Honoré,
+	S'il fait gelée,
+	Le vin diminue de moitié.
+05/18	Bon fermier à sainte Juliette
+	Doit vendre ses poulettes.
+05/22	Beau temps à la sainte Émilie
+	Donne du fruit à la folie.
+05/23	Qui sème haricots à la saint Didier
+	Les arrachera à poignées.
+
+/* Juin */
+06/08	S'il pleut à la saint Médard,
+	Il pleut quarante jours plus tard,
+	À moins que saint Barnabé
+	Ne vienne l'arrêter.
+06/11	À la saint Barnabé,
+	Fauche ton pré.
+06/16	Si le jour de saint Fargeau
+	La lune se fait dans l'eau,
+	Le reste du mois est beau.
+06/19	S'il pleut à la saint Gervais,
+	Il pleut quarante jours après.
+06/20	Pluie d'orage à la saint Sylvère,
+	C'est beaucoup de vin dans le verre.
+06/24	S'il pleut à la saint Jean,
+	Guère de vin ni de pain.
+06/25	Après la saint Jean, si le coucou chante,
+	L'année sera rude et méchante.
+06/29	S'il pleut la veille de la saint Pierre,
+	La vigne est réduite du tiers.
+
+/* Juillet */
+07/02	S'il pleut à la Visitation,
+	Pluie à discrétion.
+07/03	À la saint Anatole,
+	Confiture dans la casserole.
+07/06	Juillet sans orage,
+	Famine au village.
+07/10	Petite pluie de juillet ensoleillé
+	Emplit caves et greniers.
+07/13	Quand reviendra la saint Henri,
+	Tu planteras ton céleri.
+07/16	Qui veut des beaux navets
+	Les sème en juillet.
+07/20	À la sainte Marguerite, pluie
+	Jamais au paysan ne souris ;
+	Mais pluie à la sainte Anne,
+	Pour lui c'est de la manne.
+07/21	S'il pleut à la saint Victor,
+	La récolte n'est pas d'or.
+07/22	S'il pleut à la sainte Madeleine,
+	Il pleuvra durant six semaines.
+07/25	Si saint jacques est serein,
+	L'hiver sera dû et serein.
+07/26	Pour la sainte Anne, s'il pleut,
+	Trente jours seront pluvieux.
+
+/* Août */
+August Sun+2	En août et vendanges, il n'y a ni fêtes ni dimanches.
+08/02	S'il pleut au mois d'août,
+	Les truffes sont au bout.
+08/04	Août donne goût.
+08/06	Soleil rouge en août,
+	C'est de la pluie partout.
+08/10	Qui sème à la saint Laurent
+	Y perd la graine et puis le temps.
+08/13	S'il pleut à la sainte Radegonde,
+	Misère abonde sur le monde.
+08/15	Pluie de l'Assomption,
+	Huit jours de mouillon.
+08/16	De saint Roch la grande chaleur
+	Prépare du vin la couleur.
+08/18	Temps trop beau en août
+	Annonce hiver en courroux.
+08/20	Brumes d'août font passer les châtaignes.
+08/22	Jamais d'août la sécheresse
+	N'amènera la richesse.
+08/24	À la saint Barthélémy,
+	Paie to dû.
+08/28	Fine pluie à la saint Augustin,
+	C'est comme s'il pleuvait du vin.
+08/29	Quand les hirondelles voient la saint Michel,
+	L'hiver ne vient qu'à Noël.
+
+/* Septembre */
+09/01	Pluie de la saint Gilles ruine les glands.
+09/05	Septembre humide,
+	Pas de tonneau vide.
+09/11	Tu peux semer sans crainte
+	Quand arrive la saint Hyacinthe.
+09/15	La rosée de saint Albin
+	est, dit-on, rosée de vin.
+09/19	Qui sème à la saint Janvier
+	De l'an récolte le premier.
+09/21	Si Matthieu pleure au lieu de rire,
+	Le vin en vinaigre vire.
+09/22	Semis de saint Maurice,
+	Récolte à ton caprice.
+09/23	Septembre se nomme
+	Le mai de l'automne.
+09/25	À la saint Firmin
+	L'hiver est en chemin.
+09/29	Pluie de saint Michel sans orage
+	D'un hiver doux est le présage.
+09/30	À la saint Jérôme,
+	Hoche tes pommes.
+
+/* Octobre */
+10/02	À la saint Léger,
+	Faut s'purger !
+10/04	Sème à la saint François,
+	Ton blé aura plus de poids.
+10/09	Beau temps à la saint Denis,
+	Hiver pourri.
+10/13	En octobre, qui ne fume rien
+	Ne récolte rien.
+10/16	Coupe ton chou à la saint Gall,
+	En hiver c'est un régal.
+10/18	À la saint Luc, sème dru,
+	Ou ne sème plus.
+10/23	Gelée d'octobre
+	Rend le vigneron sobre.
+10/25	Pour saint Crépin, mort aux mouches.
+10/28	À la sainte Simone,
+	Il faut avoir rentré ses pommes.
+10/31	Quand octobre prend sa fin,
+	Dans la cave est le vin.
+
+/* Novembre */
+11/01	À la Toussaint commence l'été de la saint Martin.
+11/02	Telle Toussaint, tel Noël,
+	Et Pâques pareil.
+11/04	À la saint Charles,
+	La gelée parle.
+11/08	En novembre, s'il tonne,
+	L'année sera bonne.
+11/11	Si l'hiver va droit son chemin,
+	Vous l'aurez à la saint Martin,
+	Mais s'il trouve quelque encombrée,
+	Vous l'aurez à la saint André.
+11/11	Tue ton cochon à la saint Martin
+	Et invite ton voisin.
+11/19	Sainte Élisabeth nous montre quel bonhomme sera l'hiver.
+11/22	Pour sainte Cécile,
+	Chaque haricot en fait mille.
+11/23	Quand l'hiver vient doucement,
+	Il est là à la saint Clément.
+11/25	Sainte Catherine, toute fille veut la fêter,
+	Mais aucune ne veut la coiffer.
+11/25	Quand sainte Catherine au ciel fait la moue,
+	Il faut patauger longtemps dans la boue.
+11/30	Quand l'hiver n'est pas pressé,
+	Il arrive à la saint André.
+
+/* Décembre */
+12/SundayFirst	Tel avent,
+	Tel printemps.
+12/06	Neige de saint Nicolas
+	Donne froid pour trois mois.
+12/07	À la saint Ambroise,
+	Du froid pour huit jours.
+12/10	À la sainte Julie,
+	Le soleil ne quitte pas son lit.
+12/13	À la sainte Luce,
+	Le jour croît du saut d'une puce.
+12/16	Décembre de froid trop chiche
+	Ne fait pas le paysan riche.
+12/21	S'il gèle à la saint Thomas,
+	Il gèlera encore trois mois.
+12/23	Le tonnerre en décembre
+	Annonce pour l'an qui vient
+	Aux bêtes et aux gens
+	Abondance de biens.
+12/25	Noël au balcon,
+	Pâques au tison.
+12/26	À la saint Étienne,
+	Chacun trouve la sienne.
+12/28	Les jours entre Noël et les Rois
+	Indiquent le temps des douze mois.
+
+#endif /*! _fr_FR_ISO8859_1_proverbes_ */
diff --git a/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
new file mode 100644
index 0000000..b6ed1ef
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -0,0 +1,12 @@
+/*
+ *  hrvatski calendar
+ *
+ * $OpenBSD: calendar.all,v 1.1 1996/12/05 06:04:56 millert Exp $
+ */
+
+#ifndef _hr_HR_ISO_8859_2_all
+#define _hr_HR_ISO_8859_2_all
+
+#include <hr_HR.ISO_8859-2/calendar.praznici>
+
+#endif /* !_hr_HR_ISO_8859_2_all */
diff --git a/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
new file mode 100644
index 0000000..f1f6a4c
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -0,0 +1,37 @@
+/*
+ * hrvatski praznici
+ *
+ * $OpenBSD: calendar.praznici,v 1.2 1997/08/27 11:20:43 provos Exp $
+ */
+
+#ifndef _hr_HR_ISO_8859_2_praznici
+#define _hr_HR_ISO_8859_2_praznici
+
+LANG=hr_HR.ISO_8859-2
+
+/* slobodni dr¾avni praznici */
+01/01	Nova godina
+05/01	Prvi maj
+ 
+ 
+/* slobodni kr¹æanski praznici */
+Easter-2	Veliki petak
+Easter		Uskrs
+Easter+1 	Uskrsni ponedjeljak
+Easter+49	Duhovi
+Easter+50	Duhovni ponedjeljak
+Easter+39	Uza¹a¹æe
+12/25	Bo¾iæ
+12/26	Stjepandan
+
+/* godi¹nja doba */
+03/21*	Poèetak proljeæa
+06/21*	Poèetak ljeta
+09/21*	Poèetak jesena
+12/21*	Poèetak zime
+ 
+/* ljetno vrijeme */
+03/SundayLast	Poèetak ljetnog vremena
+10/SundayLast	Kraj ljetnog vremena
+
+#endif /* !_hr_HR_ISO_8859_2_praznici */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
new file mode 100644
index 0000000..be20116
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
@@ -0,0 +1,17 @@
+/*
+ * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
+ *
+ * $OpenBSD: calendar.all,v 1.4 2003/07/08 01:06:43 mickey Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_all
+#define _ru_RU_KOI8_R_all
+
+#include <ru_RU.KOI8-R/calendar.common>
+#include <ru_RU.KOI8-R/calendar.msk>
+#include <ru_RU.KOI8-R/calendar.pagan>
+#include <ru_RU.KOI8-R/calendar.orthodox>
+#include <ru_RU.KOI8-R/calendar.primety>
+#include <ru_RU.KOI8-R/calendar.history>
+
+#endif /* !_ru_RU_KOI8_R_all */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
new file mode 100644
index 0000000..7194dd2
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
@@ -0,0 +1,151 @@
+/*
+ * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ É ÐÁÍÑÔÎÙÅ ÄÁÔÙ
+ *
+ * $OpenBSD: calendar.common,v 1.10 2002/12/10 16:59:03 mickey Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_common_
+#define _ru_RU_KOI8_R_common_
+
+LANG=ru_RU.KOI8-R
+BODUN=âÏÄÕÎ ÎÁ ÕÔÒÏ ÏÔ:
+
+/* ñÎ×ÁÒØ */
+01/01	îÏ×ÙÊ ÇÏÄ
+01/12	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÐÒÏËÕÒÁÔÕÒÙ
+01/13	äÅÎØ òÏÓÓÉÊÓËÏÊ ÐÅÞÁÔÉ
+01/14	óÔÁÒÙÊ ÎÏ×ÙÊ ÇÏÄ
+01/25	ôÁÔØÑÎÉÎ ÄÅÎØ. óÔÕÄÅÎÞÅÓËÉÊ ÐÒÁÚÄÎÉË.
+01/27	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÔÁÍÏÖÎÉ
+
+/* æÅ×ÒÁÌØ */
+02/09	äÅÎØ ÒÏÖÄÅÎÉÑ ÔÒÁÎÓÐÏÒÔÎÏÊ Á×ÉÁÃÉÉ
+02/10	äÅÎØ ÐÁÍÑÔÉ á.ó. ðÕÛËÉÎÁ
+02/14	äÅÎØ Ó×ÑÔÏÇÏ ÷ÁÌÅÎÔÉÎÁ
+02/23	äÅÎØ ×ÏÏÒÕÖ£ÎÎÙÈ ÓÉÌ
+
+/* íÁÒÔ */
+03/01	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÇÒÁÖÄÁÎÓËÏÊ ÏÂÏÒÏÎÙ
+03/08	íÅÖÄÕÎÁÒÏÄÎÙÊ ÖÅÎÓËÉÊ ÄÅÎØ
+03/15	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÐÒÁ× ÐÏÔÒÅÂÉÔÅÌÑ
+03/19	äÅÎØ ÍÏÒÑËÁ-ÐÏÄ×ÏÄÎÉËÁ
+03/21	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ úÅÍÌÉ
+03/22	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ×ÏÄÙ
+03/23	÷ÓÅÍÉÒÎÙÊ ÍÅÔÅÏÒÏÌÏÇÉÞÅÓËÉÊ ÄÅÎØ
+03/24	äÅÎØ ÐÌÁÎÅÔÁÒÉÅ×
+03/27	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÔÅÁÔÒÁ
+03/30	äÅÎØ ÚÁÝÉÔÙ úÅÍÌÉ
+
+/* áÐÒÅÌØ */
+04/01	äÅÎØ ÛÕÔÏË
+04/12	äÅÎØ ËÏÓÍÏÎÁ×ÔÉËÉ
+04/17	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÐÏÖÁÒÎÏÊ ÏÈÒÁÎÙ
+04/26	äÅÎØ ÐÁÍÑÔÉ ÐÏÇÉÂÛÉÈ × ÒÁÄÉÁÃÉÏÎÎÙÈ Á×ÁÒÉÑÈ É ËÁÔÁÓÔÒÏÆÁÈ
+04/29	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÔÁÎÃÁ
+04/SunFirst	äÅÎØ ÇÅÏÌÏÇÁ
+04/Sun+2	äÅÎØ ×ÏÊÓË ð÷ï
+04/Sun+3	äÅÎØ ÎÁÕËÉ
+
+/* íÁÊ */
+05/01	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÓÏÌÉÄÁÒÎÏÓÔÉ ÔÒÕÄÑÝÉÈÓÑ
+05/03	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ Ó×ÏÂÏÄÙ ÐÅÞÁÔÉ
+05/05	äÅÎØ å×ÒÏÐÙ
+05/07	äÅÎØ ÒÁÄÉÏ, ÐÒÁÚÄÎÉË ÒÁÂÏÔÎÉËÏ× ×ÓÅÈ ÏÔÒÁÓÌÅÊ Ó×ÑÚÉ
+05/08	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ëÒÁÓÎÏÇÏ ëÒÅÓÔÁ É ëÒÁÓÎÏÇÏ ðÏÌÕÍÅÓÑÃÁ
+05/09	äÅÎØ ðÏÂÅÄÙ
+05/15	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÓÅÍØÉ
+05/17	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÜÌÅËÔÒÏÓ×ÑÚÉ
+05/18	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÍÕÚÅÅ×
+05/24	äÅÎØ ÓÌÁ×ÑÎÓËÏÊ ÐÉÓØÍÅÎÎÏÓÔÉ É ËÕÌØÔÕÒÙ
+05/25	äÅÎØ ÏÓ×ÏÂÏÖÄÅÎÉÑ áÆÒÉËÉ
+05/27	ïÂÝÅÒÏÓÓÉÊÓËÉÊ ÄÅÎØ ÂÉÂÌÉÏÔÅË
+05/28	äÅÎØ ÐÏÇÒÁÎÉÞÎÉËÁ
+05/31	äÅÎØ ÂÅÚ ÔÁÂÁËÁ
+05/Sun+2	äÅÎØ íÁÔÅÒÉ (2-ÏÅ ×ÏÓËÒÅÓÅÎØÅ íÁÑ)
+05/Sun+5	äÅÎØ ÈÉÍÉËÁ
+
+/* éÀÎØ */
+06/01	äÅÎØ ÚÁÝÉÔÙ ÄÅÔÅÊ
+06/03	äÅÎØ ÜËÏÌÏÇÁ
+06/05	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÏÈÒÁÎÙ ÏËÒÕÖÁÀÝÅÊ ÓÒÅÄÙ
+06/06	äÅÎØ ÒÏÖÄÅÎÉÑ á.ó. ðÕÛËÉÎÁ
+06/22	äÅÎØ ÐÁÍÑÔÉ É ÓËÏÒÂÉ. îÁÞÁÌÏ ÷ÅÌÉËÏÊ ïÔÅÞÅÓÔ×ÅÎÎÏÊ ×ÏÊÎÙ
+06/23	íÅÖÄÕÎÁÒÏÄÎÙÊ ïÌÉÍÐÉÊÓËÉÊ ÄÅÎØ
+06/24	äÅÎØ ÍÏÌÏÄ£ÖÉ òÏÓÓÉÉ
+06/25	äÅÎØ ÄÒÕÖÂÙ, ÅÄÉÎÅÎÉÑ ÓÌÁ×ÑÎ
+06/26	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÂÏÒØÂÙ Ó ÎÁÒËÏÍÁÎÉÅÊ
+06/27	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÒÙÂÏÌÏ×ÓÔ×Á
+06/Sun+2	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÌÅÇËÏÊ ÐÒÏÍÙÛÌÅÎÎÏÓÔÉ
+06/Sun+3	äÅÎØ ÍÅÄÉÃÉÎÓËÏÇÏ ÒÁÂÏÔÎÉËÁ
+06/Sat+4	äÅÎØ ÉÚÏÂÒÅÔÁÔÅÌÑ É ÒÁÃÉÏÎÁÌÉÚÁÔÏÒÁ
+
+/* éÀÌØ */
+07/01	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÁÒÈÉÔÅËÔÕÒÙ
+07/11	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÎÁÒÏÄÏÎÁÓÅÌÅÎÉÑ
+07/Sun+2	äÅÎØ ÒÏÓÓÉÊÓËÏÊ ÐÏÞÔÙ
+07/Sun+3	äÅÎØ ÍÅÔÁÌÌÕÒÇÁ
+07/Sun+4	äÅÎØ ÷ÏÅÎÎÏ-íÏÒÓËÏÇÏ æÌÏÔÁ
+
+/* á×ÇÕÓÔ */
+08/02	äÅÎØ ×ÏÚÄÕÛÎÏ-ÄÅÓÁÎÔÎÙÈ ×ÏÊÓË òÏÓÓÉÉ
+08/06	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÂÏÒØÂÙ ÚÁ ÚÁÐÒÅÝÅÎÉÅ ÑÄÅÒÎÏÇÏ ÏÒÕÖÉÑ.
+08/09	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ËÏÒÅÎÎÙÈ ÎÁÒÏÄÏ× ÍÉÒÁ
+08/22	äÅÎØ çÏÓÕÄÁÒÓÔ×ÅÎÎÏÇÏ æÌÁÇÁ òÏÓÓÉÊÓËÏÊ æÅÄÅÒÁÃÉÉ
+08/27	äÅÎØ ÒÏÓÓÉÊÓËÏÇÏ ËÉÎÏ
+08/SunFirst	äÅÎØ ÖÅÌÅÚÎÏÄÏÒÏÖÎÉËÁ
+08/Sat+2	äÅÎØ ÆÉÚËÕÌØÔÕÒÎÉËÁ
+08/Sun+2	äÅÎØ ÓÔÒÏÉÔÅÌÑ
+08/Sun+3	äÅÎØ ÷ÏÚÄÕÛÎÏÇÏ æÌÏÔÁ òÏÓÓÉÉ
+08/SunLast	äÅÎØ ÛÁÈÔÅÒÁ
+
+/* óÅÎÔÑÂÒØ */
+09/01	äÅÎØ ÚÎÁÎÉÊ
+09/09	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ËÒÁÓÏÔÙ
+09/10	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÐÁÍÑÔÉ ÖÅÒÔ× ÆÁÛÉÚÍÁ
+09/16	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÏÈÒÁÎÙ ÏÚÏÎÏ×ÏÇÏ ÓÌÏÑ
+09/27	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÔÕÒÉÚÍÁ
+09/28	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÍÏÒÑ
+09/SunFirst	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÎÅÆÔÑÎÏÊ É ÇÁÚÏ×ÏÊ ÐÒÏÍÙÛÌÅÎÎÏÓÔÉ
+09/Sun+2	äÅÎØ ÔÁÎËÉÓÔÏ×
+09/Sun+3	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÌÅÓÁ
+09/SunLast	äÅÎØ ÍÁÛÉÎÏÓÔÒÏÉÔÅÌÑ
+
+/* ïËÔÑÂÒØ */
+10/01	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÐÏÖÉÌÙÈ ÌÀÄÅÊ
+10/04	äÅÎØ ×ÏÅÎÎÏ-ËÏÓÍÉÞÅÓËÉÈ ÓÉÌ
+10/05	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÕÞÉÔÅÌÑ
+10/16	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÐÒÏÄÏ×ÏÌØÓÔ×ÉÑ
+10/17	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÐÒÏÔÅÓÔÁ ÐÒÏÔÉ× ÎÉÝÅÔÙ
+10/24	îÅÓÞÁÓÔÌÉ×ÙÊ ÄÅÎØ ÎÁ âÁÊËÏÎÕÒÅ, ÐÏÓÌÅ 1960,1963ÇÇ
+10/24	äÅÎØ ïÒÇÁÎÉÚÁÃÉÉ ïÂßÅÄÉÎÅÎÎÙÈ îÁÃÉÊ
+10/25	äÅÎØ ÔÁÍÏÖÅÎÎÉËÁ òÏÓÓÉÊÓËÏÊ ÆÅÄÅÒÁÃÉÉ
+10/30	äÅÎØ ÐÁÍÑÔÉ ÖÅÒÔ× ÐÏÌÉÔÉÞÅÓËÉÈ ÒÅÐÒÅÓÓÉÊ
+10/Wed+2	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÚÁ ÓÎÉÖÅÎÉÅ ÓÔÉÈÉÊÎÙÈ ÂÅÄÓÔ×ÉÊ
+10/SunLast	äÅÎØ ÒÁÂÏÔÎÉËÏ× Á×ÔÏÍÏÂÉÌØÎÏÇÏ ÔÒÁÎÓÐÏÒÔÁ
+
+/* îÏÑÂÒØ */
+11/07	äÅÎØ ÓÏÇÌÁÓÉÑ É ÐÒÉÍÉÒÅÎÉÑ
+11/09	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ËÁÞÅÓÔ×Á
+11/10	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÍÏÌÏÄÅÖÉ
+11/13	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÓÌÅÐÙÈ
+11/14	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÂÏÒØÂÙ ÐÒÏÔÉ× ÄÉÁÂÅÔÁ
+11/15	÷ÓÅÒÏÓÓÉÊÓËÉÊ ÄÅÎØ ÐÒÉÚÙ×ÎÉËÁ
+11/16	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÏÔËÁÚÁ ÏÔ ËÕÒÅÎÉÑ
+11/17	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÓÔÕÄÅÎÔÏ×
+11/19	äÅÎØ ÒÁËÅÔÎÙÈ ×ÏÊÓË É ÁÒÔÉÌÌÅÒÉÉ
+11/21	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÐÒÉ×ÅÔÓÔ×ÉÊ
+11/25	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÂÏÒØÂÙ ÚÁ ÌÉË×ÉÄÁÃÉÀ ÎÁÓÉÌÉÑ × ÏÔÎÏÛÅÎÉÉ ÖÅÎÝÉÎ
+
+/* äÅËÁÂÒØ */
+12/01	÷ÓÅÍÉÒÎÙÊ ÄÅÎØ ÂÏÒØÂÙ ÓÏ óðéäÏÍ
+12/03	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÉÎ×ÁÌÉÄÏ×
+12/07	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÇÒÁÖÄÁÎÓËÏÊ Á×ÉÁÃÉÉ
+12/10	äÅÎØ ÐÒÁ× ÞÅÌÏ×ÅËÁ
+12/12	äÅÎØ ëÏÎÓÔÉÔÕÃÉÉ òÏÓÓÉÊÓËÏÊ æÅÄÅÒÁÃÉÉ
+12/17	äÅÎØ ÒÁËÅÔÎÙÈ ×ÏÊÓË ÓÔÒÁÔÅÇÉÞÅÓËÏÇÏ ÎÁÚÎÁÞÅÎÉÑ
+12/20	äÅÎØ ÒÁÂÏÔÎÉËÏ× ÏÒÇÁÎÏ× ÂÅÚÏÐÁÓÎÏÓÔÉ
+12/22	äÅÎØ ÜÎÅÒÇÅÔÉËÁ
+12/27	äÅÎØ óÐÁÓÁÔÅÌÑ òÏÓÓÉÊÓËÏÊ æÅÄÅÒÁÃÉÉ
+12/29	íÅÖÄÕÎÁÒÏÄÎÙÊ ÄÅÎØ ÂÉÏÌÏÇÉÞÅÓËÏÇÏ ÒÁÚÎÏÏÂÒÁÚÉÑ
+
+#endif /* !_ru_RU_KOI8_R_common_ */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.history b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.history
new file mode 100644
index 0000000..5a5cc7b
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.history
@@ -0,0 +1,282 @@
+/*
+ * íÏÍÅÎÔÙ ÉÓÔÏÒÉÉ
+ *
+ * $OpenBSD: calendar.history,v 1.21 2006/12/25 09:49:51 grange Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_history_
+#define _ru_RU_KOI8_R_history_
+
+LANG=ru_RU.KOI8-R
+BODUN=âÏÄÕÎ ÎÁ ÕÔÒÏ ÏÔ:
+
+01/01	÷×ÅÄÅÎÉÅ × òÏÓÓÉÉ ÎÏ×ÏÇÏ ÌÅÔÏÓÞÉÓÌÅÎÉÑ, 1700Ç
+01/01	ãÅÎÔÒÁÌØÎÏÅ ÔÅÌÅ×ÉÄÅÎÉÅ óóóò ÐÅÒÅÛÌÏ ÎÁ ÅÖÅÄÎÅ×ÎÏÅ ×ÅÝÁÎÉÅ, 1955
+01/01	äÅÎÅÖÎÁÑ ÒÅÆÏÒÍÁ 10/1, 1961
+01/01	ðÅÒ×ÙÊ ×ÙÐÕÓË ÐÒÏÇÒÁÍÍÙ "÷ÒÅÍÑ", 1968
+01/01	÷ÅÌÉËÉÊ íÁÏ ÏÂ×ÉÎÉÌ ÒÕËÏ×ÏÄÓÔ×Ï óóóò × "ÚÁËÏÒÅÎÅÌÏÍ ÎÅÏËÏÌÏÎÉÁÌÉÚÍÅ"
+	É ÕÓÔÁÎÏ×ÌÅÎÉÉ × ÓÔÒÁÎÅ "ÆÁÛÉÓÔÓËÏÇÏ ÄÉËÔÁÔÏÒÓËÏÇÏ ÒÅÖÉÍÁ", 1970
+01/01	÷ óÏ×ÅÔÓËÏÊ áÒÍÉÉ ××ÅÄÅÎÏ Ú×ÁÎÉÅ ÐÒÁÐÏÒÝÉËÁ, 1972
+01/02	ðÅÒ×ÁÑ ÆÏÔÏÇÒÁÆÉÑ ìÕÎÙ, 1839Ç
+01/03	ïÔÌÕÞÅÎ ÏÔ ÃÅÒË×É íÁÒÔÉÎ ìÀÔÅÒ, 1521Ç
+01/04	éÚÏÂÒÅÔÅÎÉÅ ËÏÌÅÓÁ, 3000 ÄÏ Î.Ü.
+01/05	ðÒÉÚÎÁÎÉÅ ÂÕÄÄÉÚÍÁ × òÏÓÓÉÉ, 1741Ç
+01/06	óÏÏÒÕÖÅÎÁ óÐÁÓÓËÁÑ ÂÁÛÎÑ, 1491Ç
+01/07	é×ÁÎ çÒÏÚÎÙÊ ÓÔÁÎÏ×ÉÔÓÑ ÃÁÒÅÍ, 1547Ç
+01/07	ïÔËÒÙÔÉÅ çÁÌÉÌÅÏ çÁÌÉÌÅÑ, 1610Ç
+01/08	÷ÏÓÓÏÅÄÉÎÅÎÉÅ õËÒÁÉÎÙ Ó òÏÓÓÉÅÊ, 1654Ç
+01/09	ðÑÔÙÊ ÛÔÁÔ áÍÅÒÉËÉ, 1788Ç
+01/10	éÚÏÂÒÅÔÅÎÉÅ ÔÅÌÅÓËÏÐÁ, 1608Ç
+01/11	÷ÏÓÓÔÁÎÉÅ × ëÉÔÁÅ, 1851Ç
+01/11	õÍÅÒ è×ÏÓÔ, 2004
+01/12	éÚÏÂÒÅÔÅÎÉÅ ääô, 1939Ç
+01/13	ïÔËÒÙÔÉÅ ÷ÅÎÅÓÕÜÌÌÙ, 1499Ç
+01/15	ðÒÉÓÏÅÄÉÎÅÎÉÅ îÏ×ÇÏÒÏÄÁ, 1478Ç
+01/16	ðÏÖÁÒ ÷ ðÅÔÅÒÂÕÒÇÅ, 1718Ç
+01/17	õËÁÚ ðÅÔÒÁ, 1700Ç
+01/19	òÁÚÇÒÏÍ îÏ×ÇÏÒÏÄÁ, 1570Ç
+01/20	ðÒÏ×ÏÚÇÌÁÛÅÎ ËÏÒÏÌØ ðÏÌØÛÉ, 1320Ç
+01/20	éÚÏÂÒÅÔÅÎÉÅ ÍÏÔÏÃÉËÌÁ, 1869Ç
+01/21	ëÁÚÎØ ìÀÄÏ×ÉËÁ XVI, 1723Ç
+01/26	÷×ÅÄÅÎÉÅ ðÁÔÒÉÁÒÛÅÓÔ×Á ÎÁ òÕÓÉ, 1582Ç
+01/27	ïÔËÒÙÔÉÅ áÎÔÁÒËÔÉÄÙ, 1820Ç
+01/29	÷×ÅÄÅÎÉÅ ÇÒÁÖÄÁÎÓËÏÇÏ ÁÌÆÁ×ÉÔÁ, 1710Ç
+01/29	éÚÏÂÒÅÔÅÎÉÅ ÐÒÏÔÉ×ÏÇÁÚÁ, 1912Ç
+01/31	ïÓÎÏ×ÁÎÁ ëÕÎÓÔËÁÍÅÒÁ, 1714Ç
+
+02/01	éÚÏÂÒÅÔÅÎÉÑ áÒÈÉÍÅÄÁ, III ÄÏ Î.Ü.
+02/02	ó×ÁÄØÂÁ á.ó. ðÕÛËÉÎÁ, 1831Ç
+02/04	éÚÏÂÒÅÔÅÎÉÅ ËÎÉÇÏÐÅÞÁÔÁÎÉÑ, 1447Ç
+02/04	ðÅÒ×ÁÑ ÐÅÒÅÐÉÓØ ÎÁÓÅÌÅÎÉÑ, 1719Ç
+02/06	ðÒÉÓ×ÏÅÎÉÅ ÍÁÔÅÒÉËÕ ÎÁÚ×ÁÎÉÑ áÍÅÒÉËÁ, 1504-1538Ç
+02/08	ïÔËÒÙÔÉÅ ÎÁÓÌÅÄÓÔ×ÅÎÎÏÓÔÉ É ÇÅÎÅÔÉËÉ, 1865Ç
+02/10	éÚÏÂÒÅÔÅÎÉÅ ÂÉÏÎÉÞÅÓËÏÇÏ ÐÒÏÔÅÚÁ, 1998Ç
+02/12	éÚÏÂÒÅÔÅÎÉÅ ÕÎÉ×ÅÒÓÁÌØÎÏÇÏ ÐÁÒÏ×ÏÇÏ Ä×ÉÇÁÔÅÌÑ, 1784Ç
+02/16	ðÅÒ×ÙÊ ×ÏÉÎÓËÉÊ ÕÓÔÁ×, 1571Ç
+02/17	òÅËÏÒÄÎÁÑ ÔÅÍÐÅÒÁÔÕÒÁ, 1740Ç
+02/18	óÒÁÖÅÎÉÅ ÐÒÉ òÁË×ÅÒÅ, 1268Ç
+02/19	úÁÐÒÅÔ ÉÎÏÓÔÒÁÎÎÏÊ ÌÉÔÅÒÁÔÕÒÙ, 1793Ç
+02/21	éÚÏÂÒÅÔÅÎÉÅ ×ÅÌÏÓÉÐÅÄÁ, 1791Ç
+02/21	óÕÄ ÎÁÄ öÁÎÎÏÊ Ä'áÒË, 1431Ç
+02/22	ãÅÒËÏ×ÎÁÑ ÒÅÆÏÒÍÁ, 1651Ç
+02/23	éÚÏÂÒÅÔÅÎÉÅ ËÏÍÐØÀÔÅÒÎÏÇÏ ÔÏÍÏÇÒÁÆÁ, 1979Ç
+02/25	éÚÏÂÒÅÔÅÎÉÅ ÌÁÚÅÒÁ, 1960Ç
+02/26	óÔÒÏÉÔÅÌØÓÔ×Ï íÉÈÁÊÌÏ×ÓËÏÇÏ ÚÁÍËÁ, 1797Ç
+02/28	ïÔËÒÙÔÉÅ ÒÅËÉ óÁÎ-æÒÁÎÓÉÓËÕ, 1500Ç
+
+03/01	úÁÐÒÅÝÅÎ ×ÁÌØÓ, 1799Ç
+03/01	ïÔËÒÙÔÉÅ ÐÅÒÉÏÄÉÞÅÓËÏÇÏ ÚÁËÏÎÁ íÅÎÄÅÌÅÅ×Á, 1869Ç
+03/04	áÎÇÌÉÊÓËÁÑ ËÏÌÏÎÉÑ × áÍÅÒÉËÅ, 1681Ç
+03/05	úÁÈ×ÁÔ ô×ÅÒÉ, 1238Ç
+03/05	éÚÏÂÒÅÔÅÎÉÅ ÍÉËÒÏ×ÏÌÎÏ×ÏÊ ÐÅÞÉ, 1946Ç
+03/07	éÚÏÂÒÅÔÅÎÉÅ ÔÅÌÅÆÏÎÁ, 1876Ç
+03/08	áÎÎÁ óÔÀÁÒÔ - ËÏÒÏÌÅ×Á áÎÇÌÉÉ, 1702Ç
+03/13	ïÔËÒÙÔÁ ÐÌÁÎÅÔÁ õÒÁÎ, 1781Ç
+03/13	ïÔËÒÙÔÉÑ õÉÌØÑÍÁ çÅÒÛÅÌÑ, 1781Ç
+03/14	òÏÄÉÌÓÑ áÌØÂÅÒÔ üÊÎÛÔÅÊÎ, 1879Ç
+03/18	éÚÏÂÒÅÔÅÎÉÅ ÄÉÚÅÌØÎÏÇÏ Ä×ÉÇÁÔÅÌÑ, 1897Ç
+03/18	õÍÅÒ é×ÁÎ çÒÏÚÎÙÊ, 1584Ç
+03/22	éÚÏÂÒÅÔÅÎÉÅ ÍÁÇÎÉÔÎÏÇÏ ËÏÍÐÁÓÁ, 1302Ç
+03/25	úÁËÏÎ Ï ÚÁÐÒÅÝÅÎÉÉ ÒÁÂÏÔÏÒÇÏ×ÌÉ, 1807Ç
+03/26	÷ÚÑÔÁ áÓÔÒÁÈÁÎØ, 1706Ç
+03/28	ðÅÒ×ÁÑ ÚÉÍÏ×ËÁ × áÎÔÁÒËÔÉÄÅ, 1899Ç
+03/28	ïÔËÒÙÔÉÅ æÌÏÒÉÄÙ É ÔÅÞÅÎÉÑ çÏÌØÆÓÔÒÉÍ, 1513Ç
+03/31	úÁÍÏÓË×ÏÒÅÞØÅ ÏÓ×ÏÂÏÖÄÅÎÏ ÏÔ ÐÏÌÑËÏ×, 1611Ç
+
+04/01	ðÒÉÄÕÍÁÎ ÚÎÁË $, 1779Ç
+04/02	ðÏÄ×ÉÇ óÕÓÁÎÉÎÁ, 1613Ç
+04/03	éÚÏÂÒÅÔÅÎÉÅ ÍÏÔÏÒÎÏÊ ÌÏÄËÉ, 1909Ç
+04/04	óÄÅÌÁÎ ÔËÁÃËÉÊ ÓÔÁÎÏË, 1785Ç
+04/05	éÚÏÂÒÅÔÅÎÉÅ ÎÁÄÕ×ÎÏÊ ÌÏÄËÉ, 1912Ç
+04/05	ìÅÄÏ×ÏÅ ÐÏÂÏÉÝÅ, 1242Ç
+04/06	ïÓÁÄÁ ëÏÎÓÔÁÎÔÉÎÏÐÏÌÑ, 1453Ç
+04/10	éÚÏÂÒÅÔÅÎÉÅ Û×ÅÊÎÏÊ ÍÁÛÉÎÙ, 1846Ç
+04/12	çÒÁÖÄÁÎÓËÁÑ ×ÏÊÎÁ × áÍÅÒÉËÅ, 1861Ç
+04/17	ïÔËÒÙÔÉÅ çÕÄÚÏÎÏ×Á ÚÁÌÉ×Á, 1610Ç
+04/17	ëÏÎÅà ÑÐÏÎÓËÏ-ËÉÔÁÊÓËÏÊ ×ÏÊÎÙ, 1895Ç
+04/20	æÒÁÎÃÉÑ ÏÂßÑ×ÉÌÁ ×ÏÊÎÕ á×ÓÔÒÉÉ, 1792Ç
+04/21	ïÓÎÏ×ÁÎ òÉÍ, 753 ÄÏ Î.Ü.
+04/22	ïÔËÒÙÔÉÅ âÒÁÚÉÌÉÉ, 1500Ç
+04/24	éÚÏÂÒÅÔÅÎÉÅ ÍÉËÒÏÓËÏÐÁ, 1676Ç
+04/24	óÈ×ÁÞÅÎ óÔÅÐÁÎ òÁÚÉÎ, 1671Ç
+04/27	çÉÂÅÌØ æÅÒÎÁÎÁ íÁÇÅÌÌÁÎÁ, 1521Ç
+04/27	IV ïÌÉÍÐÉÊÓËÉÅ ÉÇÒÙ, 1908Ç
+04/29	ïÔËÒÙÔÉÅ ÔÑÖÅÌÏÇÏ ×ÏÄÏÒÏÄÁ, 1931Ç
+
+05/06	ïÔËÒÙÔÉÅ ÔÕÎÎÅÌÑ ÐÏÄ ìÁ-íÁÎÛÅÍ, 1994Ç
+05/07	ïÔËÒÙÔÉÅ íçõ, 1755Ç
+05/07	éÚÏÂÒÅÔÅÎÉÅ ÒÁÄÉÏ, 1875Ç
+05/08	ðÅÒÅÎÏÓ ÓÔÏÌÉÃÙ òÏÓÓÉÉ, 1713Ç
+05/09	ïÓÎÏ×ÁÎ ôÕÌØÓËÉÊ ÏÒÕÖÅÊÎÙÊ ÚÁ×ÏÄ, 1712
+05/09	éÚÏÂÒÅÔÅÎÉÅ ÔÅÌÅ×ÉÄÅÎÉÑ, 1911Ç
+05/12	ïÓÎÏ×ÁÎÏ äÏÎÓËÏÅ ËÁÚÁÞÅÓÔ×Ï, 1570Ç
+05/13	óÏÚÄÁÎ þÅÒÎÏÍÏÒÓËÉÊ ÆÌÏÔ, 1783Ç
+05/14	úÁÌÏÖÅÎÁ ðÅÔÒÏÐÁ×ÌÏ×ÓËÁÑ ËÒÅÐÏÓÔØ, 1706Ç
+05/14	ïÔËÒÙÔÉÅ ÍÅÔÏÄÁ ×ÁËÃÉÎÁÃÉÉ, 1796Ç
+05/17	÷ÏÊÎÁ òÏÓÓÉÉ É û×ÅÃÉÉ, 1656Ç
+05/17	éÚÏÂÒÅÔÅÎÉÅ ËÁÌÅÎÄÁÒÑ, 3000 ÄÏ Î.Ü.
+05/19	ðÅÒ×ÙÊ ×ÏÅÎÎÙÊ ËÏÒÁÂÌØ, 1668Ç
+05/20	óÏÚÄÁÎÁ ÌÁÍÐÁ ÕÌÉÞÎÏÇÏ ÏÓ×ÅÝÅÎÉÑ, 1873Ç
+05/20	äÅÎØ ÓÍÅÒÔÉ èÒÉÓÔÏÆÏÒÁ ëÏÌÕÍÂÁ, 1506Ç
+05/21	óÏÚÄÁÎÁ íÏÒÓËÁÑ Ç×ÁÒÄÉÑ òÏÓÓÉÉ, 1710Ç
+05/23	éÚÏÂÒÅÔÅÎÉÅ ÔÒÁÎÚÉÓÔÏÒÁ, 1948Ç
+05/24	óÏÖÖÅÎÁ íÏÓË×Á, 1571Ç
+05/25	ïÓ×ÅÝÅÎÁ ÐÅÒ×ÁÑ ÒÕÓÓËÁÑ ÃÅÒËÏ×Ø, 996Ç
+05/25	òÏÖÄÅÎÉÅ ÔÅÏÒÉÉ ÉÎÆÏÒÍÁÃÉÉ, 1948Ç
+05/27	úÁÌÏÖÅÎ ðÅÔÅÒÂÕÒÇ, 1703Ç
+05/28	ðÅÒ×ÙÊ Å×ÒÏÐÅÊÓËÉÊ ÁÓÔÒÏÎÏÍ, 585 ÄÏ Î.Ü.
+05/29	ðÅÒ×ÁÑ ÄÉÎÁÓÔÉÑ ÒÕÓÓËÉÈ ÃÁÒÅÊ, 826Ç
+05/30	ëÁÚÎÅÎÁ öÁÎÎÁ Ä'áÒË, 1431Ç
+
+06/01	îÁÞÁÌÏ ÚÏÌÏÔÏÄÏÂÙÞÉ ÎÁ õÒÁÌÅ, 1745Ç
+06/04	ðÅÒ×ÙÊ ×ÏÚÄÕÛÎÙÊ ÛÁÒ, 1783Ç
+06/05	éÚÏÂÒÅÔÅÎÉÅ ÇÏÌÏÇÒÁÍÍÙ, 1947Ç
+06/07	ëÏÒÏÎÁÃÉÑ ìÀÄÏ×ÉËÁ XIV, 1654Ç
+06/14	ïÔËÒÙÔÉÅ ÇÒÕÐÐ ËÒÏ×É, 1901Ç
+06/14	õÔ×ÅÒÖÄÅÎ ÆÌÁÇ óûá, 1777Ç
+06/16	éÚÏÂÒÅÔÅÎÉÅ ÁÔÏÍÎÏÊ ÂÏÍÂÙ, 1945Ç
+06/16	ëÁÚÎÅÎ óÔÅÐÁÎ òÁÚÉÎ, 1671Ç
+06/18	ïÔËÒÙÔÉÅ ÐÏÌÕÏÓÔÒÏ×Á ìÁÂÒÁÄÏÒ, 1500Ç
+06/19	ðÅÒ×ÙÊ ÂÅÊÓÂÏÌØÎÙÊ ÍÁÔÞ, 1846Ç
+06/20	éÚÏÂÒÅÔÅÎÉÅ ÆÅÊÅÒ×ÅÒËÁ, 1379Ç
+06/20	ðÒÉÍÅÎÅÎÉÅ ÍÉÎ ÒÏÓÓÉÊÓËÉÍ ÆÌÏÔÏÍ, 1855Ç
+06/21	"÷ÅÌÉËÉÊ ÐÏÖÁÒ" × íÏÓË×Å, 1547Ç
+06/24	éÚÏÂÒÅÔÅÎÉÅ Á×ÔÏÍÁÔÁ ëÁÌÁÛÎÉËÏ×Á, 1946Ç
+06/26	ðÏÄ×ÉÇ çÁÓÔÅÌÌÏ, 1941
+06/28	ðÅÒ×ÁÑ ÒÏÓÓÉÊÓËÁÑ ÂÉÒÖÁ, 1816Ç
+06/28	ðÅÒ×ÙÅ çáú-í-20 "ðÏÂÅÄÁ" ÓÏÛÌÉ Ó ËÏÎ×ÅÊÅÒÁ, 1946
+06/30	ðÏÑ×ÌÅÎÉÅ ËÁÒÔÙ ÌÕÎÎÏÊ ÐÏ×ÅÒÈÎÏÓÔÉ, 1650-Å ÇÏÄÁ
+
+07/01	ïÔÒÁ×ÌÅÎ àÌÉÊ ãÅÚÁÒØ, 23Ç
+07/02	ïÔËÒÙÔÉÅ ÒÅËÉ áÍÁÚÏÎËÉ, 1497Ç
+07/05	ïÓÎÏ×ÁÎÏ ãÁÒÓËÏÅ ÓÅÌÏ, 1710Ç
+07/05	òÏÖÄÅÎÉÅ ×ÏÚÄÕÈÏÐÌÁ×ÁÎÉÑ, 1783Ç
+07/07	õÂÉÔ ÃÁÒÅ×ÉÞ áÌÅËÓÅÊ, 1718Ç
+07/07	éÚÏÂÒÅÔÅÎÉÅ ÓÞÅÔÁ, 2500 ÄÏ Î.Ü.
+07/09	éÚÏÂÒÅÔÅÎÉÅ ×ÁÚÅÌÉÎÁ, 1870Ç
+07/13	ïÔËÒÙÔÉÑ äÖÅÊÍÓÁ ëÕËÁ, 1772Ç
+07/14	ëÏÎÓÔÁÎÔÉÎÏÐÏÌØÓËÉÊ ÍÉÒ, 1700Ç
+07/16	ìÏÍÏÎÏÓÏ× ÆÏÒÍÕÌÉÒÕÅÔ ÚÁËÏÎ, 1748Ç
+07/17	éÚÏÂÒÅÔÅÎÉÅ ÜÓËÁÌÁÔÏÒÁ, 1894Ç
+07/20	ðÅÒ×ÙÊ ÐÁÒÏÈÏÄ, 1848Ç
+07/21	ðÅÒ×ÁÑ ×ÙÓÁÄËÁ ÞÅÌÏ×ÅËÁ ÎÁ ìÕÎÕ, 1969Ç
+07/22	ïÔËÒÙÔÉÑ ÒÕÓÓËÉÈ ÍÏÒÅÐÌÁ×ÁÔÅÌÅÊ, 1803Ç
+07/23	ðÅÒ×ÁÑ ËÏÍÍÅÒÞÅÓËÁÑ çüó, 1880Ç
+07/25	ëÁÚÎØ ÄÅËÁÂÒÉÓÔÏ×, 1826Ç
+07/25	éÚÏÂÒÅÔÅÎÉÅ ÌÏËÏÍÏÔÉ×Á, 1814Ç
+07/26	ðÒÉËÁÚÁÎÏ ÏÔÌÉÔØ ãÁÒØ-ËÏÌÏËÏÌ, 1730Ç
+07/27	éÚÏÂÒÅÔÅÎÉÅ ÜÌÅËÔÒÏËÁÒÄÉÏÇÒÁÍÍÙ, 1887Ç
+07/29	ðÅÒ×ÙÅ ÍÏÔÏÇÏÎËÉ, 1899Ç
+07/29	éÚÏÂÒÅÔÅÎÉÅ ÜÌÅËÔÒÏÎÎÏÊ ÌÁÍÐÙ, 1904Ç
+07/30	ðÅÒÓÉÄÓËÉÊ ÐÏÈÏÄ ÒÕÓÓËÏÊ ÁÒÍÉÉ, 1722Ç
+07/31	úÁÌÏÖÅÎÁ õÓÐÅÎÓËÁÑ ÃÅÒËÏ×Ø, 1752Ç
+
+08/01	éÚÏÂÒÅÔÅÎÉÅ ×ÏÄÏÒÏÄÎÏÊ ÂÏÍÂÙ, 1953Ç
+08/04	éÚÏÂÒÅÔÅÎÉÅ ÎÅÂØÀÝÅÇÏÓÑ ÓÔÅËÌÁ, 1903Ç
+08/04	òÏÓÓÉÊÓËÏ-ÇÒÕÚÉÎÓËÉÊ ÄÏÇÏ×ÏÒ, 1783Ç
+08/06	ïÔËÒÙÔÉÅ ÌÅËÁÒÓÔ×-ÁÎÔÉÂÉÏÔÉËÏ×, 1928Ç
+08/07	çÁÎÇÕÔÓËÁÑ ÂÉÔ×Á, 1714Ç
+08/08	éÚÏÂÒÅÔÅÎÉÅ ÃÉËÌÏÔÒÏÎÁ, 1930Ç
+08/10	éÚÏÂÒÅÔÅÎÉÅ ÏÄÎÏÒÁÚÏ×ÏÊ ÐÏÓÕÄÙ, 1909Ç
+08/14	÷ÙÛÅÌ ðÓÁÌÔÙÒØ, 1457Ç
+08/15	éÚÏÂÒÅÔÅÎÉÅ ÄÅÔÓËÏÇÏ ÐÉÔÁÎÉÑ, 1927Ç
+08/17	éÚÏÂÒÅÔÅÎÉÅ ËÕËÕÒÕÚÎÙÈ ÈÌÏÐØÅ×, 1906Ç
+08/18	úÁËÏÎÞÉÌÁÓØ ÒÕÓÓËÏ-Û×ÅÄÓËÁÑ ×ÏÊÎÁ, 1743Ç
+08/19	éÚÏÂÒÅÔÅÎÉÅ ÞÁÓÏ×, 3000 ÄÏ Î.Ü.
+08/20	ðÒÉÓÏÅÄÉÎÅÎÉÅ óÉÂÉÒÉ Ë òÏÓÓÉÉ, 1598Ç
+08/21	õÂÉÔ ôÒÏÃËÉÊ, 1940Ç
+08/23	ðÅÒ×ÏÅ ÐÒÉÍÅÎÅÎÉÅ ÒÕÓÓËÉÍÉ ÐÕÛÅË, 1382Ç
+08/24	÷ÁÒÆÏÌÏÍÅÅ×ÓËÁÑ ÎÏÞØ, 1572Ç
+08/25	õÐÒÁÚÄÎÅÎÁ úÁÐÏÒÏÖÓËÁÑ óÅÞØ, 1792Ç
+08/26	éÚÏÂÒÅÔÅÎÉÅ ÕÐÒÁ×ÌÑÅÍÏÇÏ ÏÒÕÖÉÑ, 1943Ç
+08/26	ðÅÒ×ÙÊ íÅÄÉÃÉÎÓËÉÊ ËÏÎÇÒÅÓÓ, 1867Ç
+08/30	ïÔËÒÙÔÉÅ úÅÍÌÉ æÒÁÎÃÁ-éÏÓÉÆÁ, 1873Ç
+08/30	ðÏÄÐÉÓÁÎ îÉÛÔÁÄÓËÉÊ ÍÉÒ, 1721Ç
+08/31	úÁÐÒÅÝÅÎÏ ÓÐÁÉ×ÁÔØ ÉÎÄÅÊÃÅ×, 1674Ç
+
+09/01	íÏÓËÏ×ÓËÉÊ óÏÂÏÒ, 1492Ç
+09/01	éÚÏÂÒÅÔÅÎÉÅ ÐÒÅÓÓÏ×ÁÎÎÏÊ ÄÒÅ×ÅÓÉÎÙ, 1925Ç
+09/03	ðÏÄÐÉÓÁÎ ÷ÅÒÓÁÌØÓËÉÊ ÄÏÇÏ×ÏÒ, 1783Ç
+09/03	ïÔËÒÙÔÉÅ ÐÏÚÉÔÒÏÎÁ, 1932Ç
+09/04	ó×ÅÒÇÎÕÔ îÁÐÏÌÅÏÎ III, 1870Ç
+09/06	éÚÏÂÒÅÔÅÎÉÅ ÐÏÄ×ÏÄÎÏÊ ÌÏÄËÉ, 1620Ç
+09/07	áÍÎÉÓÔÉÑ ÄÅËÁÂÒÉÓÔÁÍ, 1856Ç
+09/08	ëÕÌÉËÏ×ÓËÁÑ ÂÉÔ×Á, 1380Ç
+09/09	ðÏÑ×ÌÅÎÉÅ "óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÏ×", 1776Ç
+09/09	ïÔËÒÙÔÉÅ ÐÏÓÌÅÄÎÅÇÏ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÁÒÈÉÐÅÌÁÇÁ, 1913Ç
+09/12	éÚÏÂÒÅÔÅÎÉÅ ÜÌÅËÔÒÏÄ×ÉÇÁÔÅÌÑ, 1891Ç
+09/15	éÚÏÂÒÅÔÅÎÉÅ ÔÁÎËÁ, 1916Ç
+09/16	úÁÐÒÅÝÅÎÙ ÞÁÓÔÎÙÅ ÔÉÐÏÇÒÁÆÉÉ, 1796Ç
+09/17	ðÒÉÎÑÔÁ ëÏÎÓÔÉÔÕÃÉÑ óûá, 1787Ç
+09/18	éÚÏÂÒÅÔÅÎÉÅ ÏÄÎÏÒÁÚÏ×ÏÊ ÒÕÞËÉ, 1953Ç
+09/20	ïÔËÒÙÔÉÅ ÐÒÏÌÉ×Á íÁÇÅÌÌÁÎÁ, 1519Ç
+09/21	ðÅÒÅÈÏÄ óÕ×ÏÒÏ×Á ÞÅÒÅÚ áÌØÐÙ, 1799Ç
+09/26	ïÔËÒÙÔÉÅ îÏ×ÏÊ áÎÇÌÉÉ, 1580Ç
+09/27	ðÅÒ×ÁÑ ÖÅÌÅÚÎÁÑ ÄÏÒÏÇÁ, 1825Ç
+09/28	ïÂßÅÄÉÎÅÎÉÅ ô×ÅÒÉ É íÏÓË×Ù, 1485Ç
+09/29	îÏÒÍÁÎÄÃÙ ×ÔÏÒÇÌÉÓØ × áÎÇÌÉÀ, 1066Ç
+09/29	éÚÏÂÒÅÔÅÎÉÅ ÜÌÅËÔÒÉÞÅÓËÏÊ Ó×ÁÒËÉ, 1860-Å
+
+10/02	éÚÏÂÒÅÔÅÎÉÅ ×ÉÄÅÏÔÅÈÎÉËÉ, 1957Ç
+10/04	ïÔËÒÙÔÉÅ ×ÉÔÁÍÉÎÏ×, 1912Ç
+10/06	îÁÞÁÌÏ ÒÕÓÓËÏ-ÔÕÒÅÃËÏÊ ×ÏÊÎÙ, 1768Ç
+10/06	éÚÏÂÒÅÔÅÎÉÅ ÂÅÚÏÐÁÓÎÏÊ ÂÒÉÔ×Ù, 1895Ç
+10/07	òÏÓÓÉÑ ÏÔËÁÚÁÌÁÓØ ÏÔ ÍÉÒÁ Ó æÒÁÎÃÉÅÊ, 1812Ç
+10/10	éÚÏÂÒÅÔÅÎÉÅ ÏÄÎÏÒÁÚÏ×ÏÊ ÚÁÖÉÇÁÌËÉ, 1972Ç
+10/12	ïÔËÒÙÔÉÅ áÍÅÒÉËÉ, 1492Ç
+10/12	é×ÁÎ çÒÏÚÎÙÊ ×ÚÑÌ ëÁÚÁÎØ, 1552Ç
+10/18	ïÔËÒÙÔÉÅ íÁÒÉÁÎÓËÏÊ ×ÐÁÄÉÎÙ, 1957Ç
+10/18	áÌÑÓËÁ ÓÔÁÌÁ ÔÅÒÒÉÔÏÒÉÅÊ óûá, 1867Ç
+10/19	ïÔËÒÙÔ ãÁÒÓËÏÓÅÌØÓËÉÊ ÌÉÃÅÊ, 1811Ç
+10/20	÷ÏÓÓÔÁÎÉÅ ÎÁ äÏÎÕ, 1707Ç
+10/23	éÚÏÂÒÅÔÅÎÉÅ ÂÕÍÁÇÉ, 105Ç
+10/29	ðÅÒ×ÙÊ ÌÅÄÏËÏÌ, 1828Ç
+10/30	õËÁÚ Ï ÎÁËÁÚÁÎÉÉ ×ÏÒÏ×, 1653Ç
+10/31	îÁÞÁÌÏ òÅÆÏÒÍÁÃÉÉ, 1517Ç
+
+11/02	éÚÏÂÒÅÔÅÎÉÅ Á×ÔÏÍÏÂÉÌÑ, 1886Ç
+11/02	ðÅÔÒ I ÓÔÁÌ ÉÍÐÅÒÁÔÏÒÏÍ, 1721Ç
+11/04	ðÅÒ×ÏÅ × ÍÉÒÅ ÍÅÔÒÏ, 1890Ç
+11/06	ðÏÑ×ÌÅÎÉÅ ÒÅÇÕÌÉÒÏ×ÝÉËÏ×, 1925Ç
+11/08	ïÔËÒÙÔÉÅ ÒÅÎÔÇÅÎÏ×ÓËÏÇÏ ÉÚÌÕÞÅÎÉÑ, 1895Ç
+11/09	é×ÁÎ çÒÏÚÎÙÊ ÕÂÉ×ÁÅÔ ÓÙÎÁ, 1582Ç
+11/10	éÚÏÂÒÅÔÅÎÉÅ ÏÄÎÏÒÁÚÏ×ÙÈ ÐÏÄÇÕÚÎÉËÏ×, 1958Ç
+11/11	ðÅÒ×ÁÑ ÒÕÓÓËÁÑ ÖÅÌÅÚÎÁÑ ÄÏÒÏÇÁ, 1837Ç
+11/12	éÚÏÂÒÅÔÅÎÉÅ ÔÅÆÌÏÎÁ, 1938Ç
+11/14	ïÔËÒÙÔÉÅ ÉÎÓÕÌÉÎÁ, 1822Ç
+11/14	òÏÄÉÌÓÑ áÌÅËÓÅÊ "è×ÏÓÔ" è×ÏÓÔÅÎËÏ, 1940
+11/15	éÚÏÂÒÅÔÅÎÉÅ ÐÁÓÓÁÖÉÒÓËÏÇÏ ÌÉÆÔÁ, 1854Ç
+11/15	òÁÚÄÅÌ òÕÓÓËÏÊ ãÅÒË×É, 1415Ç
+11/16	óÏÚÄÁÎÁ ÍÏÒÓËÁÑ ÐÅÈÏÔÁ, 1705Ç
+11/18	ïÔËÒÙÔÉÅ ×ÏÄÏÐÁÄÁ ÷ÉËÔÏÒÉÑ, 1854Ç
+11/21	éÚÏÂÒÅÔÅÎÉÅ ×ÅÒÔÏÌÅÔÁ, 1930-Å
+11/24	óÏÚÄÁÎÉÅ ÔÅÏÒÉÉ Ü×ÏÌÀÃÉÉ, 1859Ç
+11/25	ä×ÕÇÌÁ×ÙÊ ÏÒÅÌ - ÓÉÍ×ÏÌ òÏÓÓÉÉ, 1472Ç
+11/26	éÚÏÂÒÅÔÅÎÉÅ ÐÒÏÒÅÚÉÎÅÎÎÏÇÏ ÐÌÁÝÁ, 1823Ç
+11/28	ïÔËÒÙÔÉÅ ïÇÎÅÎÎÏÊ úÅÍÌÉ, 1520Ç
+11/28	÷×ÅÄÅÎÁ × ÓÔÒÏÊ íÏÓËÏ×ÓËÁÑ ÜÌÅËÔÒÏÓÔÁÎÃÉÑ, 1897Ç
+11/29	ïÔËÒÙÔÉÅ ÍÅÔÏÄÁ ÌÏÂÏÔÏÍÉÉ, 1936Ç
+
+12/04	÷ íÏÓË×Å ÏÔËÒÙÔ ÐÅÒ×ÙÊ ÇÏÓÐÉÔÁÌØ, 1707Ç
+12/05	éÚÏÂÒÅÔÅÎÉÅ ÄÖÉÎÓÏ×ÙÈ ÂÒÀË, 1873Ç
+12/06	åÌÉÚÁ×ÅÔÁ ÓÔÁÎÏ×ÉÔÓÑ ÉÍÐÅÒÁÔÒÉÃÅÊ, 1741Ç
+12/07	éÚÏÂÒÅÔÅÎÉÅ ÁÓÐÉÒÉÎÁ, 1898Ç
+12/15	ïÔËÒÙÔÉÅ Ñ×ÌÅÎÉÑ ÒÁÄÉÏÁËÔÉ×ÎÏÓÔÉ, 1898Ç
+12/17	éÚÏÂÒÅÔÅÎÉÅ ÓÁÍÏÌÅÔÁ, 1903Ç
+12/19	éÚÏÂÒÅÔÅÎÉÅ ÒÔÕÔÎÏÇÏ ÂÁÒÏÍÅÔÒÁ, 1648Ç
+12/22	óÏÚÄÁÎ ïÒÄÅÎ ÄÏÍÉÎÉËÁÎÃÅ×, 1216Ç
+12/23	éÚÏÂÒÅÔÅÎÉÅ ÆÏÔÏÇÒÁÆÉÉ, 1839Ç
+12/24	óÏÚÄÁÎ ëÕ-ëÌÕËÓ-ëÌÁÎ, 1865Ç
+12/25	éÚÏÂÒÅÔÅÎÉÅ ÐÌÁ×ÁÀÝÅÇÏ ÍÙÌÁ, 1878Ç
+12/26	÷ÏÓÓÔÁÎÉÅ ÄÅËÁÂÒÉÓÔÏ×, 1825Ç
+12/26	ïÔËÒÙÔÉÅ "íÅÔÒÏÐÏÌØ òÅËÏÒÄß" × Ó.áÐÒÅÌÅ×ËÁ, 1910
+12/28	òÏÖÄÅÎÉÅ ËÉÎÅÍÁÔÏÇÒÁÆÁ, 1895Ç
+12/29	ïÓÎÏ×ÁÎÉÅ ÐÅÒ×ÙÈ ×ÏÓØÍÉ òÏÓÓÉÊÓËÉÈ ÇÕÂÅÒÎÉÊ: íÏÓËÏ×ÓËÏÊ,
+	éÎÇÅÒÍÁÎÄÓËÏÊ, ëÉÅ×ÓËÏÊ, óÍÏÌÅÎÓËÏÊ, áÒÈÁÎÇÅÌÏÇÏÒÏÄÓËÏÊ,
+	ëÁÚÁÎÓËÏÊ, áÚÏ×ÓËÏÊ É óÉÂÉÒÓËÏÊ, 1708
+12/29	ðÏÖÁÒ × úÉÍÎÅÍ Ä×ÏÒÃÅ, 1837Ç
+12/30	÷ÁÌÉÅÓÁÒÓËÉÊ ÄÏÇÏ×ÏÒ ÓÏ û×ÅÃÉÅÊ, 1658
+12/30	ðÅÒ×ÙÊ ÷ÓÅÓÏÀÚÎÙÊ ÓßÅÚÄ óÏ×ÅÔÏ× ÐÒÉÎÑÌ ÄÅËÌÁÒÁÃÉÀ ÓÏÚÄÁÎÉÑ óóóò, 1922
+12/31	ôÕ-144 ÓÏ×ÅÒÛÉÌ ÐÅÒ×ÙÊ × ÍÉÒÅ Ó×ÅÒÈÚ×ÕËÏ×ÏÊ ÐÁÓÓÁÖÉÒÓËÉÊ ÒÅÊÓ, 1968
+
+#endif /* !_ru_RU_KOI8_R_history_ */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
new file mode 100644
index 0000000..e35311e
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
@@ -0,0 +1,16 @@
+/*
+ * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
+ *
+ * $OpenBSD: calendar.msk,v 1.4 2002/08/26 15:48:21 mickey Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_msk_
+#define _ru_RU_KOI8_R_msk_
+
+LANG=ru_RU.KOI8-R
+BODUN=âÏÄÕÎ ÎÁ ÕÔÒÏ ÏÔ:
+
+03/SunLast	îÁÞÁÌÏ ÍÏÓËÏ×ÓËÏÇÏ ÌÅÔÎÅÇÏ ×ÒÅÍÅÎÉ; ÞÁÓÙ ÐÅÒÅ×ÏÄÑÔÓÑ ×ÐÅÒÅÄ
+10/SunLast	ëÏÎÅà ÍÏÓËÏ×ÓËÏÇÏ ÌÅÔÎÅÇÏ ×ÒÅÍÅÎÉ; ÞÁÓÙ ÐÅÒÅ×ÏÄÑÔÓÑ ÎÁÚÁÄ
+
+#endif /* !_ru_RU_KOI8_R_msk_ */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
new file mode 100644
index 0000000..a6e00ff
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
@@ -0,0 +1,60 @@
+/*
+ * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
+ *
+ * $OpenBSD: calendar.orthodox,v 1.9 2003/11/17 23:35:30 mickey Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_orthodox_
+#define _ru_RU_KOI8_R_orthodox_
+
+LANG=ru_RU.KOI8-R
+
+09/11	õÓÅËÎÏ×ÅÎÉÅ ÇÌÁ×Ù ðÒÏÒÏËÁ, ðÒÅÄÔÅÞÉ É ëÒÅÓÔÉÔÅÌÑ çÏÓÐÏÄÎÑ éÏÁÎÎÁ.
+	äÅÎØ ÐÏÓÔÎÙÊ.
+09/21	òÏÖÄÅÓÔ×Ï ðÒÅÓ×ÑÔÏÊ ÷ÌÁÄÙÞÉÃÙ ÎÁÛÅÊ âÏÇÏÒÏÄÉÃÙ É ðÒÉÓÎÏÄÅ×Ù íÁÒÉÉ
+09/27	÷ÏÚÄ×ÉÖÅÎÉÅ þÅÓÔÎÏÇÏ É öÉ×ÏÔ×ÏÒÑÝÅÇÏ ëÒÅÓÔÁ çÏÓÐÏÄÎÑ
+10/09	ðÒÅÓÔÁ×ÌÅÎÉÅ ÁÐÏÓÔÏÌÁ É Å×ÁÎÇÅÌÉÓÔÁ éÏÁÎÎÁ âÏÇÏÓÌÏ×Á
+10/14	ðÏËÒÏ× ðÒÅÓ×ÑÔÏÊ âÏÇÏÒÏÄÉÃÙ
+11/17	ïÓÎÏ×ÁÎÉÅ ÓÏÂÏÒÁ Ó×.îÉËÏÌÁÑ × Ç.îØÀ-êÏÒËÅ, 1903
+12/04	÷×ÅÄÅÎÉÅ ×Ï ÈÒÁÍ ðÒÅÓ×ÑÔÏÊ âÏÇÏÒÏÄÉÃÙ
+12/19	ó×ÑÔÉÔÅÌÑ îÉËÏÌÁÑ, ÁÒÈÉÅÐÉÓËÏÐÁ íÉÒ ìÉËÉÊÓËÉÈ, ÞÕÄÏÔ×ÏÒÃÁ
+01/06	îÁ×ÅÞÅÒÉÅ òÏÖÄÅÓÔ×Á èÒÉÓÔÏ×Á
+01/07	òÏÖÄÅÓÔ×Ï èÒÉÓÔÏ×Ï
+01/14	ïÂÒÅÚÁÎÉÅ çÏÓÐÏÄÎÅ
+01/16	÷ÏÛÅÓÔ×ÉÅ ÎÁ ÐÒÅÓÔÏÌ é×ÁÎÁ ÷ÁÓÉÌØÅ×ÉÞÁ òÀÒÉËÏ×ÉÞÁ (çÒÏÚÎÏÇÏ), 1547
+01/19	âÏÇÏÑ×ÌÅÎÉÅ ÉÌÉ ëÒÅÝÅÎÉÅ çÏÓÐÏÄÎÅ
+01/20	óÏÂÏÒ ðÒÅÄÔÅÞÉ É ëÒÅÓÔÉÔÅÌÑ çÏÓÐÏÄÎÑ éÏÁÎÎÁ
+02/11	ðÏÍÉÎÏ×ÅÎÉÅ ×ÓÅÈ ÕÓÏÐÛÉÈ,
+	ÐÏÓÔÒÁÄÁ×ÛÉÈ × ÇÏÄÉÎÕ ÇÏÎÅÎÉÊ ÚÁ ×ÅÒÕ èÒÉÓÔÏ×Õ, 1991
+02/15	óÒÅÔÅÎÉÅ çÏÓÐÏÄÎÅ
+02/25	é×ÅÒÓËÏÊ ÉËÏÎÙ âÏÖÉÅÊ íÁÔÅÒÉ
+03/22	óÏÒÏËÁ óÅ×ÁÓÔÉÊÓËÉÈ ÍÕÞÅÎÉËÏ×
+03/25	ó×ÑÔÏÇÏ çÒÉÇÏÒÉÑ ä×ÏÅÓÌÏ×Á
+Paskha-56	úÁÇÏ×ÅÎØÅ ÎÁ ÍÑÓÏ
+Paskha-49	÷ÅÌÉËÉÊ ðÏÓÔ
+Paskha-8	ìÁÚÁÒÅ×Á ÓÕÂÂÏÔÁ
+Paskha-7	÷ÅÒÂÎÏÅ ÷ÏÓËÒÅÓÅÎØÅ. ÷ÈÏÄ çÏÓÐÏÄÅÎØ × éÅÒÕÓÁÌÉÍ
+Paskha-3	÷ÅÌÉËÉÊ (þÉÓÔÙÊ) þÅÔ×ÅÒÇ
+Paskha-2	óÔÒÁÓÔÎÁÑ ðÑÔÎÉÃÁ
+Paskha	÷ÏÓËÒÅÓÅÎÉÅ èÒÉÓÔÏ×Ï
+Paskha+1	ó×ÅÔÌÁÑ ÓÅÄÍÉÃÁ - ÓÐÌÏÛÎÁÑ
+Paskha+7	áÎÔÉÐÁÓÈÁ
+Paskha+39	÷ÏÚÎÅÓÅÎÉÅ çÏÓÐÏÄÎÅ
+Paskha+49	ðÑÔÉÄÅÓÑÔÎÉÃÁ
+Paskha+50	äÅÎØ ó×ÑÔÏÇÏ äÕÈÁ
+Paskha+53	óÅÍÉË
+Paskha+56	ôÒÏÉÃÉÎ äÅÎØ, úÁÇÏ×ÅÎØÅ ÎÁ ðÅÔÒÏ× ÐÏÓÔ
+Paskha+60	ðÒÁÚÄÎÉË ôÅÌÁ èÒÉÓÔÏ×Á
+Paskha+63	òÏÖÄÅÓÔ×Ï ÞÅÓÔÎÏÇÏ ÓÌÁ×ÎÏÇÏ ðÒÏÒÏËÁ,
+	ðÒÅÄÔÅÞÉ É ëÒÅÓÔÉÔÅÌÑ çÏÓÐÏÄÎÑ éÏÁÎÎÁ
+04/07	âÌÁÇÏ×ÅÝÅÎÉÅ ðÒÅÓ×ÑÔÏÊ âÏÇÏÒÏÄÉÃÙ
+04/24	ïÂÎÏ×ÌÅÎÉÅ ãÁÒØÇÒÁÄÁ
+05/06	ó×ÑÔÏÇÁ ×ÅÌÉËÏÍÕÞÅÎÉËÁ çÅÏÒÇÉÑ ðÏÂÅÄÏÎÏÓÃÁ
+05/22	ðÅÒÅÎÅÓÅÎÉÅ ÍÏÝÅÊ Ó×ÑÔÉÔÅÌÑ É ÞÕÄÏÔ×ÏÒÃÁ îÉËÏÌÁÑ ÉÚ íÉÒ ìÉËÉÊÓËÉÈ × âÁÒ
+06/24	áÐÏÓÔÏÌÏ× ÷ÁÒÆÏÌÏÍÅÑ É ÷ÁÒÎÁ×Ù
+07/12	óÌÁ×ÎÙÈ É ×ÓÅÈ×ÁÌØÎÙÈ ÐÅÒ×Ï×ÅÒÈÏ×ÎÙÈ ÁÐÏÓÔÏÌÏ× ðÅÔÒÁ É ðÁ×ÌÁ
+08/02	äÅÎØ éÌØÉ ðÒÏÒÏËÁ
+08/19	ðÒÅÏÂÒÁÖÅÎÉÅ çÏÓÐÏÄÎÅ
+08/28	õÓÐÅÎÉÅ ðÒÅÓ×ÑÔÏÊ âÏÇÏÒÏÄÉÃÙ
+
+#endif /* !_ru_RU_KOI8_R_orthodox_ */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
new file mode 100644
index 0000000..f8516f6
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
@@ -0,0 +1,55 @@
+/*
+ * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
+ *
+ * $OpenBSD: calendar.pagan,v 1.7 2005/03/26 20:56:20 mickey Exp $
+ */
+
+#ifndef _ru_RU_KOI8_R_pagan_
+#define _ru_RU_KOI8_R_pagan_
+
+LANG=ru_RU.KOI8-R
+BODUN=âÏÄÕÎ ÎÁ ÕÔÒÏ ÏÔ:
+
+Paskha-47	íÁÓÌÅÎÉÃÁ
+Paskha-43	äÅÄÙ íÁÓÌÅÎÉÞÎÙÅ
+Paskha+7	ëÒÁÓÎÁÑ çÏÒËÁ. äÅÎØ äÁÖØÂÏÇÁ, ìÁÄÙ É ìÅÌÑ
+Paskha+13	òÁÄÏÎÉÞÎÙÅ ÄÅÄÙ
+Paskha+16	òÁÄÕÎÉÃÁ
+Paskha+55	ôÒÏÉÃËÉÅ ÄÅÄÙ
+
+03/14	îÏ×ÙÊ çÏÄ, ï×ÓÅÎØ ÍÁÌÙÊ
+03/25*	÷ÅÓÅÎÎÅÅ ÒÁ×ÎÏÄÅÎÓÔ×ÉÅ
+04/04	äÅÎØ ìÁÄÙ
+04/07	äÅÎØ íÁÒÅÎÙ (ÓÄ×ÉÎÕÔÏÅ ×ÅÓÅÎÎÅÅ ÒÁ×ÎÏÄÅÎÓÔ×ÉÅ)
+04/13	äÅÎØ ÐÌÏÄÏÒÏÄÉÑ. éÍÅÎÉÎÙ úÅÍÌÉ
+05/06	äÅÎØ äÁÖØÂÏÇÁ, ï×ÓÅÎØ ÂÏÌØÛÏÊ
+05/22	ñÒÉÌÉÎ äÅÎØ
+06/15*	äÅÎØ ôÒÉÇÌÁ×Á
+06/21*	ìÅÔÎÅÅ ÓÏÌÎÃÅÓÔÏÑÎÉÅ
+07/01	òÕÓÁÌØÎÁÑ îÅÄÅÌÑ
+07/07	ëÕÐÁÌÁ (ÓÄ×ÉÎÕÔÏÅ ÌÅÔÎÅÅ ÓÏÌÎÃÅÓÔÏÑÎÉÅ)
+07/12	ñÒÉÌÉÎ äÅÎØ
+07/27	ïÔÂÏÒ ÖÅÒÔ× ðÅÒÕÎÕ, ÒÕÓÁÌÉÉ
+08/02	ðÅÒÕÎÏ× äÅÎØ
+08/08	îÁÞÁÌÏ ÖÁÔ×Ù
+08/20	ðÒÁÚÄÎÉË ÕÒÏÖÁÑ
+08/21	äÅÎØ óÔÒÉÂÏÇÁ
+08/28	õÓÐÅÎÉÅ úÌÁÔÏÇÏÒËÉ
+09/07	ï×ÓÑÎÉÃÁ
+09/14	äÅÎØ ÷ÏÌÈÁ úÍÅÅ×ÉÞÁ
+09/22*	ðÏ×ÏÒÏÔ Ë ÚÉÍÅ (ÏÓÅÎÎÅÅ ÒÁ×ÎÏÄÅÎÓÔ×ÉÅ)
+09/27	ðÔÉÃÙ É ÚÍÅÉ ÏÔÐÒÁ×ÌÑÀÔÓÑ × éÒØÅ, ÔÅÐÌÕÀ ÒÁÊÓËÕÀ ÓÔÒÁÎÕ, ÇÄÅ ÃÁÒÉÔ
+	×ÅÞÎÏÅ ÌÅÔÏ É ÒÁÓÔÅÔ ÍÉÒÏ×ÏÅ ÄÅÒÅ×Ï
+11/10	äÅÎØ íÁËÏÛÉ
+11/21	äÅÎØ ó×ÁÒÏÇÁ É óÅÍÁÒÇÌÁ
+12/09	äÅÎØ äÁÖØÂÏÇÁ É íÁÒÅÎÙ
+12/21*	úÉÍÎÅÅ ÓÏÌÎÃÅÓÔÏÑÎÉÅ
+12/25	ëÏÌÑÄÁ (ÓÄ×ÉÎÕÔÏÅ ÚÉÍÎÅÅ ÓÏÌÎÃÅÓÔÏÑÎÉÅ)
+12/26	äÅÎØ òÏÄÁ É ÒÏÖÁÎÉÃ
+12/31	îÅÄÅÌÑ ðÒÁÏÔÃÏ×
+01/06	äÅÎØ ëÁÝÅÑ É ÷ÅÌÅÓÁ, ÐÏÓÔ
+02/24	äÅÎØ ÷ÅÌÅÓÁ
+02/29	äÅÎØ ëÁÝÅÑ
+03/01	äÅÎØ íÁÒÅÎÙ
+
+#endif /* !_ru_RU_KOI8_R_pagan_ */
diff --git a/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.primety b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.primety
new file mode 100644
index 0000000..fb66ce0
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.primety
@@ -0,0 +1,396 @@
+/*	$OpenBSD: calendar.primety,v 1.3 2007/03/18 14:02:20 mickey Exp $	*/
+
+/*	based on: http://www.rus-sky.com/rc/
+ *	w/ the following license:
+ *	÷ÓÅ ÍÁÔÅÒÉÁÌÙ ÓÅÒ×ÅÒÁ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ É ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ
+ *	ÂÅÚ ËÁËÉÈ-ÌÉÂÏ ÏÇÒÁÎÉÞÅÎÉÊ.
+ */
+
+CALENDAR=julian
+
+01/01	÷ÁÓÉÌØÅ× ×ÅÞÅÒ. îÁ ÷ÁÓÉÌØÅ× ×ÅÞÅÒ ÄÅÎØ ÐÒÉÂÁ×ÌÑÅÔÓÑ ÎÁ ËÕÒÉÎÙÊ ÛÁÇ.
+	÷ ÜÔÏÔ ×ÅÞÅÒ ÄÅ×ÕÛËÉ ÇÁÄÁÀÔ Ï ÚÁÍÕÖÅÓÔ×Å.
+01/04	úÏÓÉÍÙ. ðÏÓÌÅÄÎÉÅ ó×ÑÔÏÞÎÙÅ ÇÁÄÁÎÉÑ.
+01/06	ëÒÅÝÅÎÓËÉÅ ÍÏÒÏÚÙ. ôÒÅÝÉ, ÔÒÅÝÉ, ÐÏËÁ ÎÅ ÐÒÉÛÌÉ ×ÏÄÏÈÒÅÝÉ.
+01/10	çÒÉÇÏÒÉÑ ìÅÔÏÕËÁÚÁÔÅÌÑ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÎÁ ÓËÉÒÄÁÈ ÈÌÅÂÁ ÌÑÖÅÔ ÉÎÅÊ,
+	ÔÏ ÌÅÔÏ ÂÕÄÅÔ ÄÏÖÄÌÉ×ÏÅ.
+01/12	ôÁÔØÑÎÙ ëÒÅÝÅÎÓËÏÊ. ëÒÅÝÅÎÓËÉÅ ÍÏÒÏÚÙ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÉÄÅÔ ÓÎÅÇ,
+	ÔÏ ÌÅÔÏ ÂÕÄÅÔ ÄÏÖÄÌÉ×ÏÅ.
+01/16	ðÅÔÒÁ ðÏÌÕËÏÒÍÁ. ëÏÌØ ÅÓÔØ ÍÅÔÌÁ ÄÏ ËÏÓÔÒÁ, ÔÏ ÂÕÄÅÔ ÈÌÅÂÁ ÄÏ ðÅÔÒÁ,
+	Á ÓÉÎÅÃ É Ú×ÏÎÅà ÄÏ×ÅÄÕÔ ÈÌÅÂÕ ËÏÎÅÃ.
+01/18	áÆÁÎÁÓØÅ×ÓËÉÅ ÍÏÒÏÚÙ. áÆÁÎÁÓÉÊ É ëÉÒÉÌÌÅ ÚÁÂÉÒÁÀÔ ÚÁ ÒÙÌÏ.
+01/22	ôÉÍÏÆÅÑ ðÏÌÕÚÉÍÎÉËÁ. ôÉÍÏÆÅÅ×ÓËÉÅ ÍÏÒÏÚÙ.
+01/24	áËÓÉÎØÉ ðÏÌÕÈÌÅÂÎÉÃÙ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÎÁ ÒÙÎËÁÈ ÈÌÅ ÐÏÄÅÛÅ×ÅÅÔ,
+	ÔÏ É ÎÏ×ÙÊ ÈÌÅ ÂÕÄÅÔ ÄÅÛÅ×. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÐÏÇÏÄÁ ÈÏÒÏÛÁÑ, ÔÏ É
+	×ÅÓÎÁ ÂÕÄÅÔ ËÒÁÓÎÁÑ.
+01/28	åÆÒÅÍÏ× ÄÅÎØ.  ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÕ ÎÏÞØ ÄÏÍÏ×ÏÊ ÇÌÕÍÉÔÓÑ ÎÁ Ä×ÏÒÁÈ,
+	ÄÌÑ ÎÅÇÏ ÓÔÁ×ÑÔ ÎÁ ÚÁÇÎÅÔËÅ ËÁÛÕ.
+
+02/01	ôÒÉÆÏÎÏ× ÄÅÎØ. ÷ ÜÔÏÔ ÄÅÎØ ÚÁËÌÉÎÁÀÔ ÍÙÛÅÊ,
+	ÞÔÏÂÙ ÎÅ ÐÏÒÔÉÌÉ ÓËÉÒÄÙ Ó ÈÌÅÂÏÍ.
+02/02	÷ÓÔÒÅÔÅÎÓËÉÅ ÍÏÒÏÚÙ. îÁ óÒÅÔÅÎÉÅ ÚÉÍÁ Ó ÌÅÔÏÍ ×ÓÔÒÅÔÉÌÉÓØ.
+	ëÏÌÉ ÎÁ óÒÅÔÅÎÉÅ ÍÅÔÅÌØ ÄÏÒÏÇÕ ÚÁÍÅÔÅÔ, ÔÏ ËÏÒÍ ×ÅÓØ ÐÏÄÂÅÒÅÔ.
+02/03	ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÕ ÎÏÞØ ÄÏÍÏ×ÏÊ ÚÁÅÚÖÁÅÔ ÌÏÛÁÄÅÊ.
+02/05	áÇÁÆÉÉ ëÏÒÏ×ÎÉÃÙ.  ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÐÏ ÇÏÒÏÄÁÍ É
+	ÓÅÌÁÍ ÂÅÇÁÅÔ ëÏÒÏ×ØÑ óÍÅÒÔØ.
+02/06	÷ÕËÏÌÁ ôÅÌÑÔÎÉËÁ. îÁ ÄÅÎØ ÷ÕËÏÌÙ ÔÅÌÑÔÓÑ ÖÕËÏÌÙ (Ô.Å. ÞÅÒÎÙÅ ËÏÒÏ×Ù).
+02/11	÷ÌÁÓØÅ× ÄÅÎØ. ðÒÉÛÅÌ ÷ÌÁÓØÅ× ÄÅÎØ, ÐÒÉÛÌÉ É ÷ÌÁÓØÅ×ÓËÉÅ ÍÏÒÏÚÙ.
+02/15	ïÎÉÓÉÍÁ ï×ÞÁÒÎÉËÁ. ÷ ÜÔÕ ÎÏÞØ Ï×ÞÁÒÉ ÏËÌÉËÁÀÔ Ú×ÅÚÄÙ ÄÌÑ
+	ÏÂÉÌØÎÏÇÏ ÐÌÏÄÏÒÏÄÉÑ Ï×ÅÃ.
+02/25	ôÁÒÁÓÁ ëÕÍÁÛÎÉËÁ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÏÐÁÓÎÏ ÌÏÖÉÔØÓÑ ÓÐÁÔØ:
+	ÍÏÖÎÏ ÎÁÓÐÁÔØ ËÕÍÁÈÕ (ÌÉÈÏÒÁÄËÕ).
+02/28	÷ÁÓÉÌÉÑ ëÁÐÅÌØÎÉËÁ.  ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÂÙ×ÁÅÔ ×ÓÅÇÄÁ ÏÔÔÅÐÅÌØ.
+02/29	ëÁÓØÑÎÁ çÒÏÚÎÏÇÏ. úÉÎÕÌ ëÁÓØÑÎ ÎÁ ËÒÅÓÔØÑÎ.
+	îÁÛ ëÁÓØÑÎ ÎÁ ÞÔÏ ÎÉ ×ÚÇÌÑÎÅÔ - ×ÓÅ ×ÑÎÅÔ.
+
+03/01	á×ÄÏÔØÉ ÷ÅÓÎÏ×ËÉ. ÷ ÜÔÏÔ ÄÅÎØ ×ÓÔÒÅÞÁÀÔ ×ÅÓÎÕ É ÐÏÀÔ:
+	-- ÷ÅÓÎÁ ËÒÁÓÎÁ, ÞÔÏ ÔÙ ÎÁÍ ÐÒÉÎÅÓÌÁ? - ëÒÁÓÎÏÅ ÌÅÔÅÞËÏ!
+03/04	çÅÒÁÓÉÍÁ çÒÁÞÅ×ÎÉËÁ. ðÒÉÌÅÔÁÀÔ ÉÚ-ÚÁ ÍÏÒÑ ÇÒÁÞÉ.
+03/05	ëÏÎÏÎÁ ïÇÏÒÏÄÎÉËÁ. ó ÜÔÏÇÏ ÄÎÑ ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØ ËÏÐÁÔØ ÏÇÏÒÏÄ.
+03/09	÷ ÜÔÏÔ ÄÅÎØ ÐÒÉÌÅÔÁÀÔ ÉÚ-ÚÁ ÍÏÒÑ ÖÁ×ÏÒÏÎËÉ.  îÁ 40 ÍÕÞÅÎÉËÏ×
+	ÄÅÎØ Ó ÎÏÞØÀ ÍÅÒÑÅÔÓÑ, ÚÉÍÁ ËÏÎÞÁÅÔÓÑ, ×ÅÓÎÁ ÎÁÞÉÎÁÅÔÓÑ.
+03/17	áÌÅËÓÅÑ, ÞÅÌÏ×ÅËÁ âÏÖÉÑ - Ó ÇÏÒ ÐÏÔÏËÉ. óÁÎÉ ÐÏËÉÎØ, Á ÔÅÌÅÇÕ ÐÏÄ×ÉÎØ.
+03/19	äÁÒØÉ - ÇÒÑÚÎÙÅ ÐÒÏÒÕÂÉ.
+03/22	÷ÁÓÉÌÉÑ óÏÌÎÅÞÎÉËÁ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÐÒÉ ×ÏÓÈÏÄÅ ÓÏÌÎÃÁ ÂÕÄÕÔ
+	×ÉÄÎÙ ÎÁ ÎÅÂÅ ËÒÁÓÎÙÅ ËÒÕÇÉ, ÔÏ ÜÔÏÔ ÇÏÄ ÏÂÅÝÁÅÔ ÐÌÏÄÏÒÏÄÉÅ.
+03/25	âÌÁÇÏ×ÅÝÅÎØÅ - ÐÔÉà ÎÁ ×ÏÌÀ ÏÔÐÕÝÅÎØÅ. îÁ âÌÁÇÏ×ÅÝÅÎØÅ ×ÅÓÎÁ ÚÉÍÕ
+	ÐÏÂÏÒÏÌÁ. îÁ âÌÁÇÏ×ÅÝÅÎØÅ ÐÏÄ ÄÙÍÏÍ ÎÅ ÓÉÄÑÔ (ÐÅÒÅÂÉÒÁÀÔÓÑ × ÓÅÎÉ
+	É ËÌÅÔÉ). îÁ âÌÁÇÏ×ÅÝÅÎØÅ ÍÅÄ×ÅÄØ ×ÓÔÁÅÔ. ðÏËÒÏ× - ÎÅ ÌÅÔÏ,
+	âÌÁÇÏ×ÅÝÅÎØÅ - ÎÅ ÚÉÍÁ. ëÁËÏ×Ï âÌÁÇÏ×ÅÝÅÎØÅ, ÔÁËÏ×Á É ó×ÑÔÁÑ.
+	îÁ âÌÁÇÏ×ÅÝÅÎØÅ ÐÔÉÃÁ ÇÎÅÚÄÁ ÎÅ ×ØÅÔ, Á ÚÁ×ØÅÔ - ÓÔÁÎÅÔ ÎÁ ×ÓÅ
+	ÌÅÔÏ ÐÅÛÅÀ, ËÁË ËÕËÕÛËÁ (ÞÔÏ ÎÁ âÌÁÇÏ×ÅÝÅÎØÅ ÇÎÅÚÄÏ ÚÁ×ÉÌÁ).
+	îÁ âÌÁÇÏ×ÅÝÅÎØÅ ×ÏÒÙ ÚÁ×ÏÒÏ×Ù×ÁÀÔ ÄÌÑ ÓÞÁÓÔØÑ ÎÁ ×ÅÓØ ÇÏÄ.
+	åÓÌÉ ÎÁ âÌÁÇÏ×ÅÝÅÎØÅ ËÒÁÓÎÙÊ ÄÅÎØ, ÔÏ ÇÏÄ ÂÕÄÅÔ ÇÒÏÚÎÙÊ É ÐÏÖÁÒÎÙÊ.
+03/26	÷ÁÓÉÌÉÑ îÏ×ÏÇÏ. þÔÏ ÎÉ ÒÏÄÉÔÓÑ ÎÁ ÄÅÎØ çÁ×ÒÉÌÁ - ÕÒÏÄÌÉ×Ï É ÎÅÓÐÏÒÏ.
+	÷ÁÓÉÌÉÑ - ×Ù×ÅÒÎÉ ÏÇÌÏÂÌÉ. ðÒÑÖÁ ÐÏÓÌÅ ÷ÁÓÉÌØÅ×Á ÄÎÑ ÎÅ ÉÄÅÔ ×ÐÒÏË.
+03/27	íÁÔÒÅÎÙ ðÏÌÕÒÅÐÉÃÙ, îÁÓÔÏ×ÉÃÙ (ÎÁÓÔ - ÏËÒÅÐÌÙÊ ÓÎÅÇ).
+	ýÕËÁ È×ÏÓÔÏÍ ÌÅÄ ÒÁÚÂÉ×ÁÅÔ, Á Ï×ÓÑÎËÁ ÐÏÅÔ:
+	-- ðÏËÉÎØ ÓÁÎËÉ, ×ÏÚØÍÉ ×ÏÚ!
+03/30	é×ÁÎÁ ìÅÓÔ×ÉÞÎÉËÁ. ÷ ÜÔÏÔ ÄÅÎØ ÐÅËÕÔ ÉÚ ÔÅÓÔÁ ÌÅÓÔÎÉÃÙ ÄÌÑ
+	×ÏÓÈÏÖÄÅÎÉÑ × ÂÕÄÕÝÅÊ ÖÉÚÎÉ ÎÁ ÎÅÂÏ É ÐÏÌÁÇÁÀÔ, ÞÔÏ × ÔÏ ×ÒÅÍÑ
+	ÄÏÍÏ×ÏÊ ÎÁÞÉÎÁÅÔ ÂÅÓÉÔØÓÑ ÄÏ ÐÏÌÕÎÏÞÉ, ËÁË ÚÁÐÏÀÔ ÐÅÔÕÈÉ.
+
+04/01	íÁÒØÉ - ÐÕÓÔÙÅ ÝÉ (ÚÁÐÁÓ ËÁÐÕÓÔÙ ×ÙÛÅÌ). úÁÈÏÔÅÌ × ÁÐÒÅÌÅ ËÉÓÌÙÈ ÝÅÊ!
+	åÓÌÉ × ÜÔÏÔ ÄÅÎØ ×ÓËÒÏÅÔÓÑ ×ÏÄÁ, ÔÏ ÂÕÄÅÔ ÂÏÌØÛÁÑ ÔÒÁ×Á É ÒÁÎÎÉÊ ÐÏËÏÓ.
+	ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÐÒÏÓÙÐÁÅÔÓÑ ÄÏÍÏ×ÏÊ, É ÄÌÑ ÔÏÇÏ
+	ÎÕÖÎÏ ÏÂÍÁÎÙ×ÁÔØ ÄÒÕÇ ÄÒÕÇÁ.
+04/03	îÉËÉÔÉÎ ÄÅÎØ. ÷ÏÄÑÎÏÊ ÐÒÏÓÙÐÁÅÔÓÑ. åÓÌÉ Õ ËÏÇÏ ÓËÏÔÉÎÁ ÎÅ ËÏ Ä×ÏÒÕ
+	ÉÌÉ ÎÅ ×ÅÄÅÔÓÑ, ÔÏ ÐÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÎÕÖÎÏ ×ÏÄÑÎÏÍÕ ÐÒÉÎÅÓÔÉ
+	ÎÁ ÖÅÒÔ×Õ ÌÏÛÁÄØ (ÕÔÏÐÉÔØ), ÞÔÏÂÙ ÕÍÉÌÏÓÔÉ×ÉÔØ ÅÇÏ:
+	-- ÷ÏÔ ÔÅÂÅ, ÄÅÄÕÛËÁ, ÇÏÓÔÉÎÅà ÎÁ ÎÏ×ÏÓÅÌØÅ, ÌÀÂÉ ÄÁ ÖÁÌÕÊ ÎÁÓ!
+04/05	æÅÄÕÌÁ ÷ÅÔÒÅÎÉËÁ. ðÒÉÛÅÌ æÅÄÕÌ - ÔÅÐÌÙÊ ×ÅÔÅÒ ÐÏÄÕÌ. îÁ æÅÄÕÌÁ
+	ÐÏÒÁÎØÛÅ ×ÓÔÁ×ÁÊ ÄÁ ÏËÏÎÎÉÃÕ ÏÔ×ÏÒÑÊ (Ô. Å. ÒÁÍÙ ×ÙÓÔÁ×ÌÑÊ)!
+	æÅÄÕÌ ÇÕÂÙ ÎÁÄÕÌ (ÎÅÎÁÓÔØÅ). îÁ æÅÄÕÌÁ Ó×ÅÒÞËÉ ÐÒÏÓÙÐÁÀÔÓÑ.
+04/08	òÏÄÉ×ÏÎÁ ìÅÄÏÌÏÍÁ. òÏÄÉ×ÏÎ ×ÏÄÙ ÐÒÉÎÅÓ, ÕÓÔÁ×Ø ÓÏÈÕ ÐÅÒÅÐÁÈÁÔØ Ï×ÅÓ.
+	ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÓÏÌÎÃÅ ×ÓÔÒÅÞÁÅÔÓÑ Ó ÍÅÓÑÃÅÍ É ÒÅËÉ
+	×ÓËÒÙ×ÁÀÔÓÑ. ëÏÌÉ ×ÓÔÒÅÞÁ ÄÏÂÒÁÑ - ÈÏÒÏÛÅÅ ÌÅÔÏ, Á ÈÕÄÁÑ - ÐÌÏÈÏÅ.
+04/11	áÎÔÉÐÙ ÷ÏÄÏÐÏÌÁ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏ ×ÒÅÍÑ ÒÅËÉ ÏÞÉÝÁÀÔÓÑ ÏÔÏ ÌØÄÁ.
+04/12	÷ÁÓÉÌÉÊ ðÁÒÉÊÓËÉÊ ÚÅÍÌÀ ÐÁÒÉÔ. ÷ÅÓÎÁ ÚÅÍÌÀ ÐÁÒÉÔ.
+	÷Ù×ÅÒÎÉ ÏÇÌÏÂÌÉ, Á ÓÁÎÉ ÎÁ ÐÏ×ÅÔØ.
+04/23	åÇÏÒÉÑ ×ÅÛÎÅÇÏ. åÇÏÒÉÊ Ó ÔÅÐÌÏÍ, Á îÉËÏÌÁ Ó ËÏÒÍÏÍ. åÇÏÒÉÊ Ó ×ÏÄÏÊ
+	(ÒÏÓÏÊ), Á îÉËÏÌÁ Ó ÔÒÁ×ÏÊ.  åÇÏÒÉÊ Ó ÍÏÓÔÏÍ, Á îÉËÏÌÁ Ó Ç×ÏÚÄÅÍ.
+	åÇÏÒÉÊ Ó ÎÏÛÅÊ (Ó ËÕÚÏ×ÏÍ), Á îÉËÏÌÁ Ó ×ÏÚÏÍ. îÅ È×ÁÌÉÓØ ÎÁ åÇÏÒØÅ×
+	ÄÅÎØ ÐÏÓÅ×ÏÍ, Á ÎÁ îÉËÏÌÉÎ ÄÅÎØ ÔÒÁ×ÏÊ! ÷ åÇÏÒØÅ× ÄÅÎØ ÒÁÚ×Å ÌÅÎÉ×ÁÑ
+	ÓÏÈÁ ÎÅ ×ÙÅÚÖÁÅÔ. îÁ åÇÏÒÉÑ ÐÒÉÌÅÔ ÌÁÓÔÏÞËÁÍ. îÁ åÇÏÒÉÑ ÒÏÓÁ - ÎÅ ÎÁÄÏ
+	ËÏÎÑÍ Ï×ÓÁ. åÇÏÒÉÊ ÚÁÐÁÓÁÅÔ ËÏÒÏ×, îÉËÏÌÁ ËÏÎÅÊ. åÇÏÒÉÊ - ÐÒÁÚÄÎÉË
+	ÐÁÓÔÕÈÏ× (ÔÁË ËÁË × ÅÇÏ ÄÅÎØ ×ÙÇÏÎÑÀÔ × ÐÅÒ×ÙÊ ÒÁÚ ÓËÏÔ × ÐÏÌÅ ×ÅÒÂÏÀ
+	Ó ÷ÅÒÂÎÏÇÏ ×ÏÓËÒÅÓÅÎÉÑ). åÇÏÒØÑ ÒÏÓÁ ÏÔ ÓÇÌÁÚÁ, ÏÔ ÓÅÍÉ ÎÅÄÕÇÏ×. âÕÄØ
+	ÚÄÏÒÏ×, ËÁË åÇÏÒØÑ ÒÏÓÁ! ëÏÌÉ ÎÁ åÇÏÒuÑ ÂÅÒÅÚÏ×ÙÊ ÌÉÓÔ × ÐÏÌÕÛËÕ - Ë
+	õÓÐÅÎÉÀ ËÌÁÄÉ ÈÌÅÂ × ËÁÄÕÛËÕ. ñÒÏ×ÏÊ ÓÅÊ ÄÏ åÇÏÒØÑ ÉÌÉ Ó åÇÏÒØÑ.
+	âÏÇÁÔÙÊ ÓÙÔ É × åÇÏÒØÅ× ÄÅÎØ, Á ÂÅÄÎÙÊ ÔÅÒÐÉÔ ÄÏ óÐÁÓÁ.  ðÏÄ åÇÏÒØÑ
+	×ÅÛÎÅÇÏ ÎÅ ÒÁÂÏÔÁÀÔ, ÞÔÏ ×ÏÌË Ï×Åà ÎÅ ÐÏÅÌ. åÇÏÒÉÊ ÒÁÚßÅÚÖÁÅÔ ÐÏ
+	ÌÅÓÁÍ ÎÁ ÂÅÌÏÍ ËÏÎÅ É Ú×ÅÒÑÍ ÒÁÚÄÁÅÔ ÎÁËÁÚÙ.  ÷ÓÑË Ú×ÅÒØ Õ åÇÏÒØÑ ÐÏÄ
+	ÒÕËÏÊ. þÔÏ Õ ×ÏÌËÁ × ÚÕÂÁÈ, ÔÏ åÇÏÒÉÊ ÄÁÌ.  åÇÏÒÉÊ ×ÅÓÎÕ ÎÁÞÉÎÁÅÔ,
+	éÌØÑ ÌÅÔÏ ËÏÎÞÁÅÔ. åÇÏÒÉÊ ÒÁÂÏÔÙ ÐÏÞÉÎÁÅÔ, åÇÏÒÉÊ É ËÏÎÞÁÅÔ.  ó åÇÏÒØÑ
+	ÈÏÒÏ×ÏÄÙ, Ó äÍÉÔÒÉÑ ÐÏÓÉÄÅÌËÉ.
+	ó åÇÏÒuÑ ÐÏ óÅÍÅÎ ÄÅÎØ (ÓÒÏËÉ ÓÄÅÌËÁÍ É ÎÁÊÍÁÍ).
+04/25	âÁÂÉÊ ÐÒÁÚÄÎÉË. ðÒÉÌÅÔ ÐÅ×ÞÉÈ ÐÔÉà ÓÔÁÑÍÉ.
+04/28	÷ÅÔÅÒ ÔÅÐÌÑË - ÚÄÏÒÏ×ÑË. âÏÌØÎÙÈ ÏÔÐÁÉ×ÁÀÔ ÂÅÒÅÚÏ×ÙÍ ÓÏËÏÍ.
+04/30	ôÅÐÌÁÑ ÎÏÞØ É Ú×ÅÚÄÎÁÑ - Ë ÕÒÏÖÁÀ, Á ÑÓÎÙÊ ×ÓÈÏÄ ÓÏÌÎÃÁ - ×ÅÄÒÏÅ ÌÅÔÏ.
+
+05/10	úÅÍÌÑ-ÉÍÅÎÉÎÎÉÃÁ, ÇÒÅÈ ÐÁÈÁÔØ, ÓÏÂÉÒÁÀÔ ÚÅÌØÑ Õ ÂÏÌÏÔÁ,
+	ËÏÐÁÀÔ ËÏÒÅÎØÑ ÎÁ ÚÅÌØÑ.
+05/11	íÏËÉÑ íÏËÒÏÇÏ. åÓÌÉ ÜÔÏÔ ÄÅÎØ ÍÏËÒÙÊ, ÔÏ É ÌÅÔÏ ÂÕÄÅÔ ÍÏËÒÏÅ.
+	÷ ÜÔÏÔ ÄÅÎØ ÎÅ ÒÁÂÏÔÁÀÔ, ÂÏÑÓØ, ÞÔÏÂÙ ÇÒÁÄ ÎÅ ÐÏÂÉÌ ÐÏÌÅÊ.
+05/13	ìÕËÅÒØÉ ëÏÍÁÒÎÉÃÙ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÐÒÉÌÅÔÁÀÔ ËÏÍÁÒÙ.
+05/14	óÉÄÏÒÁ ïÇÕÒÅÞÎÉËÁ. îÁ óÉÄÏÒÁ ÅÝÅ ÓÉ×ÅÒËÏ (ÓÅ×ÅÒÎÏ). ðÒÉÄÕÔ óÉÄÏÒÙ,
+	ÍÉÎÕÀÔ É ÓÉ×ÅÒÙ (ÚÁÍÏÒÏÚËÉ), ÐÒÉÌÅÔÑÔ ÓÔÒÉÖÉ É ËÁÓÁÔÏÞËÉ, ÐÒÉÎÅÓÕÔ
+	ÔÅÐÌÏ.  ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÄÏÌÖÎÏ ÓÁÖÁÔØ ÏÇÕÒÃÙ É ÓÅÑÔØ ÌÅÎ.
+05/15	ðÁÈÏÍÁ ôÅÐÌÏÇÏ, âÏËÏÇÒÅÑ. ðÒÉÛÅÌ ðÁÈÏÍ - ÚÁÐÁÈÌÏ ÔÅÐÌÏÍ.
+	îÁ ðÁÈÏÍÁ ÐÏÚÄÎÉÊ ÐÏÓÅ× Ï×ÓÁ É ÐÛÅÎÉÃÙ.
+05/16	æÅÄÏÒÁ öÉÔÎÉËÁ. ëÔÏ ÓÅÅÔ ÐÏÓÌÅ æÉÔÁ, ÐÒÏÓÔ ÂÕÄÅÔ ÖÉÔÁ. ðÏÌÁÇÁÀÔ,
+	ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÄÏÌÖÎÏ ÎÅÐÒÅÍÅÎÎÏ ÓÅÑÔØ ÈÌÅÂÁ.
+05/18	æÅÄÏÔÁ ï×ÓÑÎÎÉËÁ. ëÏÌÉ ÎÁ æÅÄÏÔÁ ÎÁ ÄÕÂÕ ÍÁËÕÛËÁ Ó ÏÐÕÛËÏÊ,
+	ÔÏ ÂÕÄÅÛØ ÍÅÒÉÔØ Ï×ÅÓ ËÁÄÕÛËÏÊ. åÓÌÉ ÎÁ æÅÄÏÔÁ ÄÕÂÏ×ÙÊ ÌÉÓÔ
+	ÒÁÚ×ÅÒÎÕÌÓÑ, ÔÏ ÚÅÍÌÑ ÐÒÉÎÑÌÁÓØ ÚÁ Ó×ÏÊ ÒÏÄ. óÅÍØ ÄÅ× ÓÅÀÔ ÌÅÎ.
+05/21	áÌÅÎÙ ìÅÎÏÓÅÊËÉ. áÌÅÎÙ - ÄÌÉÎÎÙÅ ÌØÎÙ. îÁ áÌÅÎÕ ÓÅÊ ÌÅÎ, ÔÁËÖÅ ÑÒÉÃÕ,
+	ÇÒÅÞÕ, ÑÞÍÅÎØ É ÐÏÚÄÎÀÀ ÐÛÅÎÉÃÕ; ÔÏÖÅ ÓÁÖÁÊ ÏÇÕÒÃÙ.
+05/25	é×ÁÎÁ - ÍÅÄ×ÑÎÙ (×ÒÅÄÎÙÅ) ÒÏÓÙ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÎÁ ÒÑÂÉÎÅ ÍÎÏÇÏ Ã×ÅÔÏ×,
+	ÔÏ ÂÕÄÅÔ ÈÏÒÏÛÉÊ ÕÒÏÖÁÊ ÈÌÅÂÁ. ìÅÞÅÂÎÙÅ ÚÅÌØÑ ËÌÁÄÕÔ ÐÏÄ é×ÁÎÏ×Õ ÒÏÓÕ.
+05/29	æÅÄÏÓØÉ ëÏÌÏÓÎÉÃÙ. ðÏÌÁÇÁÀÔ, ÞÔÏ Ó ÜÔÏÇÏ ÄÎÑ ÒÏÖØ ÎÁÞÉÎÁÅÔ ËÏÌÏÓÉÔØÓÑ.
+	äÅÎØ æÅÄÏÓØÉ ÓÔÏÉÔ ×ÓÅÈ ÐÏÎÅÄÅÌØÎÉËÏ× (ÎÅÓÞÁÓÔÎÙÊ).
+05/30	éÓÁËÉÑ úÍÅÅ×ÎÉËÁ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÚÍÅÉ ÓÔÁÎÉÃÁÍÉ ÈÏÄÑÔ
+	ÐÏ ÌÅÓÁÍ. îÁ éÓÁËÉÑ ÓÁÖÁÀÔ ÂÏÂÙ.
+05/31	åÒÍÉÑ òÁÓÐÒÑÇÁÌØÎÉËÁ. ëÁË ÎÁ åÒÅÍÉÑ (1 ÍÁÑ) ÚÁÐÒÑÇÁÌØÎÉËÁ, ÐÏÔÏÍÕ ÞÔÏ
+	ÎÁ åÒÅÍÉÑ ÐÏÄÙÍÉ ÓÅÔÅ×Ï (ÓÅ×ÁÌËÕ), ÔÁË É ÎÁ åÒÍÅÑ ÖÅ (åÒÍÉÑ, 31 ÍÁÑ)
+	ÒÁÓÐÒÑÇÁÌØÎÉËÁ, ÐÏÔÏÍÕ ÞÔÏ ÏÐÕÓÔÉ ÓÅÔÅ×Ï (Ô.Å. ÎÁÞÁÌÏ É ËÏÎÅà ÐÏÓÅ×Ï×).
+
+06/01	õÓÔÉÎÏ× ÄÅÎØ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ÞÉÓÔ ×ÏÓÈÏÄ ÓÏÌÎÃÁ, ÂÕÄÅÔ ÈÏÒÏÛÉÊ
+	ÎÁÌÉ× ÒÖÉ. åÓÌÉ ÖÅ ÜÔÏÔ ÄÅÎØ ÄÏÖÄÌÉ×ÙÊ É ÍÒÁÞÎÙÊ, ÔÏ ÂÕÄÅÔ ÈÏÒÏÛ
+	ÕÒÏÖÁÊ ÌØÎÁ É ËÏÎÏÐÌÉ.
+06/03	ìÕËØÑÎÁ ÷ÅÔÒÅÎÉËÁ. ÷ ÜÔÏÔ ÄÅÎØ ÇÁÄÁÀÔ ÐÏ ×ÅÔÒÁÍ.
+06/08	æÅÄÏÒÁ ëÏÌÏÄÅÚÎÉËÁ. ðÒÁÚÄÎÉË ËÏÌÏÄÅÚÎÉËÏ×, ËÏÔÏÒÙÅ ÏÐÒÏËÉÄÙ×ÁÀÔ
+	ÓËÏ×ÏÒÏÄÙ, ÞÔÏÂÙ ÕÚÎÁÔØ, ÇÄÅ ÅÓÔØ ×ÏÄÑÎÁÑ ÖÉÌÁ, É ËÏÌÉ ÓËÏ×ÏÒÏÄÁ
+	ÓÙÒÁ, ÔÕÔ É ×ÏÄÁ. çÒÏÚÁ ÎÁ æÅÄÏÒÁ ÌÅÔÎÅÇÏ - ÐÌÏÈÁÑ ÕÂÏÒËÁ ÓÅÎÁ.
+06/09	ëÏÎÅà ×ÅÓÎÙ, ÐÏÞÉÎ ÌÅÔÕ.
+06/10	ëÏÌÉ ÎÁ ôÉÍÏÆÅÑ ÚÎÁÍÅÎÉÑ - ÂÕÄÅÔ ÇÏÌÏÄ.
+06/12	ðÅÔÒÁ ðÏ×ÏÒÏÔÁ, óÏÌÏÎÏ×ÏÒÏÔÁ, ëÁÐÕÓÔÎÉËÁ. óÏÌÎÃÅ ÎÁ ÚÉÍÕ,
+	Á ÌÅÔÏ ÎÁ ÖÁÒÙ, ÓÏÌÎÃÅ ÕËÏÒÁÞÉ×ÁÅÔ ÈÏÄ, Á ÍÅÓÑà ÉÄÅÔ ÎÁ ÐÒÉÂÙÌØ.
+06/13	áËÕÌÉÎÙ - ÚÁÄÅÒÉ È×ÏÓÔÙ (ÓËÏÔ ÂÅÓÉÔÓÑ ÏÔ Ï×ÏÄÏ×, ÓÔÒÏÞÉÔÓÑ).
+	ðÏÌÁÇÁÀÔ, ÞÔÏ Ó ÜÔÏÇÏ ÄÎÑ ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØ ÓÅÑÔØ ÇÒÅÞÉÈÕ, Á ÐÏ
+	ÄÒÕÇÉÍ ÉÓÔÏÞÎÉËÁÍ - ÌÉÂÏ ÚÁ ÎÅÄÅÌÀ ÄÏ áËÕÌÉÎÙ, ÌÉÂÏ ÓÐÕÓÔÑ ÎÅÄÅÌÀ.
+	÷ ÜÔÏÔ ÄÅÎØ - ÍÉÒÓËÁÑ ËÁÛÁ ÄÌÑ ÎÉÝÉÈ. ðÒÁÚÄÎÉË ËÁÛ.
+06/15	÷ÉÔÁ - ëÔÏ ÓÅÅÔ ÐÏÓÌÅ ÷ÉÔÁ, ÐÒÏÓÔ ÂÙ×ÁÅÔ ÖÉÔÁ.
+06/16	ôÉÈÏÎÁ. îÁ ôÉÈÏÎÁ É ÐÔÉÃÙ ÚÁÔÉÈÁÀÔ (ËÒÏÍÅ ÓÏÌÏ×ØÑ).
+06/20	ðÒÁÚÄÎÉË ÐÅÒÅÐÅÌÑÔÎÉËÏ×.
+06/23	áÇÒÁÆÅÎÙ ëÕÐÁÌØÎÉÃÙ. îÁÞÁÌÏ ËÕÐÁÎØÑ (ÎÁ ÓÅ×ÅÒÅ), ÚÁËÕÐÙ×ÁÀÔÓÑ.
+	ôÒÁ×Ù × ÓÏËÕ, É ÐÏÔÏÍÕ - ÓÂÏÒ ÌÅÞÅÂÎÙÈ ËÏÒÅÎØÅ× É ÚÅÌÉÊ ÎÁËÁÎÕÎÅ
+	é×ÁÎÁ ëÕÐÁÌÁ. íÏÀÔÓÑ É ÐÁÒÑÔÓÑ × ÂÁÎÑÈ. ïÂÝÅÅ ËÕÐÁÎØÅ Ó ÐÅÓÎÑÍÉ É Ô.Ð.
+06/24	é×ÁÎÁ ëÕÐÁÌÁ. é×ÁÎÏ× ÄÅÎØ ÐÒÉÛÅÌ, ÔÒÁ×Õ ÓÏÂÉÒÁÔØ ÐÏÛÅÌ. ÷ ÜÔÏÔ ÄÅÎØ
+	ÔÏÖÅ ÓÏÂÉÒÁÀÔ ÔÒÁ×Ù. ðÁÐÏÒÏÔÎÉË ÒÁÓÃ×ÅÔÁÅÔ × ÐÏÌÎÏÞØ ÎÁ é×ÁÎÁ ëÕÐÁÌÁ,
+	É ÉÍ ÏÔËÒÙ×ÁÀÔ ËÌÁÄÙ. îÁ é×ÁÎÁ ëÕÐÁÌÁ ËÏÇÏ ÐÏÂØÀÔ (ÎÁ ÉÇÒÉÝÁÈ), ÐÉÛÉ
+	ÐÒÏÐÁÌÏ.  ðÒÏÓÉÔÅ, ÄÅÔËÉ (ÌÉÂÏ ÐÏÐÙ), ÄÏÖÄÑ ÏÔ é×ÁÎÁ, Á ÐÏÓÌÅ é×ÁÎÁ
+	É ÓÁÍ Ñ ÕÐÒÏÛÕ.
+06/26	ôÉÈ×ÉÎÓËÏÊ ñÇÏÄÏÞÎÉÃÙ. äÁ×ÉÄÁ úÅÍÌÑÎÉÞÎÉËÁ.
+	ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÐÏÓÐÅ×ÁÅÔ ÚÅÍÌÑÎÉËÁ.
+06/27	óÁÍÓÏÎÁ óÅÎÏÇÎÏÑ (ÓÅÎÏ ÚÁÇÎÉ×ÁÅÔ).
+	îÁ óÁÍÓÏÎÁ ÄÏÖÄØ - ÓÅÍØ ÎÅÄÅÌØ ÄÏÖÄØ, ÄÏ ÂÁÂØÅÇÏ ÌÅÔÁ ÍÏËÒÏ.
+06/29	ðÅÔÒÁ É ðÁ×ÌÁ. ó ðÅÔÒÏ×Á ÄÎÑ ËÒÁÓÎÏÅ ÌÅÔÏ, ÚÅÌÅÎÙÊ ÐÏËÏÓ. öÅÎÓËÏÅ
+	ÌÅÔÏ ÐÏ ðÅÔÒÏ× ÄÅÎØ. ÷ ðÅÔÒÏ× ÄÅÎØ ÂÁÒÁÛËÁ × ÌÏÂ.  ÷ ðÅÔÒÁ ÚÁÒÎÉÃÁ
+	ÈÌÅ ÚÏÒÉÔ. ó ðÅÔÒÏ×Á ÄÎÑ × ÐÏÌÅ ÐÏÖÎÑ (ÐÏËÏÓ). ðÒÏÛÌÁ ðÅÔÒÏ×ËÁ -
+	ÏÐÁÌÏ ÐÏ ÌÉÓÔÕ, ÐÒÏÛÅÌ éÌØÑ - ÏÐÁÌÏ Ä×Á.  óÏÌÏ×ØÉ ÐÏÀÔ ÄÏ ðÅÔÒÁ,
+	Á ËÕËÕÛËÁ ËÕËÕÅÔ. ðÅÔÒ É ðÁ×ÅÌ ÐÏÌÞÁÓÁ ÓÂÁ×ÉÌ.  îÅ È×ÁÌÉÓØ, ÂÁÂËÁ,
+	ÞÔÏ ÚÅÌÅÎÏ, Á ÓÍÏÔÒÉ, ËÁËÏ× ðÅÔÒÏ×. ðÅÔÒÏ×ËÁ - ÇÏÌÏÄÏ×ËÁ.  õÔÅÛÉÌÉ
+	ÂÁÂËÕ ðÅÔÒÏ×ÓËÉÅ ÖÁÒÙ ÇÏÌÏÄÕÈÏÊ.  ìÁÄØ ËÏÓÙ É ÓÅÒÐÙ Ë ðÅÔÒÏ×Õ ÄÎÀ.
+06/30	÷ ÜÔÏÔ ÄÅÎØ, ÓÏÂÉÒÁÑÓØ ÎÁ ÐÏËÏÓ, ÐÒÏ×ÏÖÁÀÔ ×ÅÓÎÕ.
+
+07/01	ëÏÓÍÙ É äÁÍÉÁÎÁ. ëÕÚØÍÙ É äÅÍØÑÎÙ ÐÒÉÛÌÉ - ÎÁ ÐÏËÏÓ ÐÏÛÌÉ.
+07/04	ïÚÉÍÉ × ÎÁÌÉ×ÁÈ, Á ÇÒÅÞÁ × ÉÓÈÏÄÅ, Ô.Å. ÎÁ ×ÙÈÏÄÅ; ÉÌÉ:
+	É ÒÕÂÁÈÉ ÎÅÔ, Á Ï×ÅÓ ÄÏ ÐÏÌÏ×ÉÎÙ ÄÏÒÏÓ.
+07/05	åÓÌÉ × ÜÔÏÔ ÄÅÎØ ×ÅÞÅÒÏÍ ÉÇÒÁÅÔ ÍÅÓÑÃ, ÔÏ ÏÂÅÝÁÅÔ ÈÏÒÏÛÉÊ ÕÒÏÖÁÊ.
+07/06	÷ÓÑËÉÊ åÒÅÍÅÊ ÐÒÏ ÓÅÂÑ ÒÁÚÕÍÅÊ: ËÏÇÄÁ ÓÅÑÔØ, ËÏÇÄÁ ÖÁÔØ É ËÏÇÄÁ ×
+	ÓËÉÒÄÙ ÕÂÉÒÁÔØ. ÷ ÜÔÏÔ ÄÅÎØ ÎÅÐÒÅÍÅÎÎÏ ÎÕÖÎÏ ÏËÏÎÞÉÔØ ÐÏÓÅ×.
+07/08	ðÒÏËÏÆØÑ öÁÔ×ÅÎÉËÁ (ÚÁÖÉÎÁÀÔ ÒÏÖØ).
+07/12	ðÒÏËÌÁ - ×ÅÌÉËÉÅ ÒÏÓÙ.
+07/15	ëÉÒÉËÁ É éÕÌÌÉÔÙ. îÅ ÖÎÉ ÎÁ ëÉÒÉËÁ É õÌÉÔÙ - ÍÁÎØÑËÉ (×ÉÄÅÎÉÑ) Õ×ÉÄÉÛØ.
+07/16	æÉÎÏÇÅÎÁ ÷ÏÌÏÄËÉ. ÷ ÜÔÏÔ ÄÅÎØ, ËÏÇÄÁ ÎÁÞÉÎÁÀÔ ÖÁÔØ, ÏÓÔÁ×ÌÑÀÔ ÎÁ ÎÉ×Å
+	ÎÅÓËÏÌØËÏ ËÏÌÏÓØÅ× ÎÁ ËÏÒÎÀ, É ÜÔÏÔ ÎÅÓÖÁÔÙÊ ËÌÏÞÏË ÎÁÚÙ×ÁÅÔÓÑ
+	"×ÏÌÏÄËÁ ÎÁ ÂÏÒÏÄËÕ". îÁ áÆÉÎÏÇÅÎÁ ÐÔÁÛËÉ ÚÁÄÕÍÙ×ÁÀÔÓÑ.
+07/19	íÁËÒÉÄÁ ÍÏËÒÁ - É ÏÓÅÎØ ÍÏËÒÁ. óÍÏÔÒÉ ÏÓÅÎØ ÐÏ íÁËÒÉÄÅ.
+07/20	éÌØÑ ÚÁÖÉÎÁÅÔ, ÌÅÔÏ ËÏÎÞÁÅÔ; ÐÅÒ×ÙÊ ÓÎÏÐ - ÐÅÒ×ÙÊ ÏÓÅÎÎÉÊ ÐÒÁÚÄÎÉË.
+	ðÅÔÒ Ó ËÏÌÏÓËÏÍ, éÌØÑ Ó ËÏÌÏÂËÏÍ. îÏ×ÁÑ ÎÏ×ÉÎÁ ÎÁ éÌØÉÎ ÄÅÎØ.  óÅÑÔØ
+	ÎÁ éÌØÉÎÓËÏÊ ÐÏÌÑÎÅ. îÁ éÌØÀ ÌÅÔÏ ÄÏ ÏÂÅÄÁ, ÏÓÅÎØ ÐÏÓÌÅ ÏÂÅÄÁ. äÏ éÌØÉ
+	ÔÕÞÉ ÐÏ ×ÅÔÒÕ, ÐÏÓÌÅ éÌØÉ ÐÒÏÔÉ× ×ÅÔÒÕ.  ðÒÉÄÅÔ éÌØÑ - ÐÒÉÎÅÓÅÔ ÇÎÉÌØÑ
+	(ÄÏÖÄÅÊ). éÌØÉÎÓËÉÍ ÄÏÖÄÅÍ ÕÍÙ×ÁÀÔÓÑ ÏÔ ÐÒÉÚÏÒÁ, ÏËÁÞÉ×ÁÀÔÓÑ. äÏ
+	éÌØÉ É ÐÏÄ ËÕÓÔÏÍ ÓÕÛÉÔ, Á ÐÏÓÌÅ éÌØÉ É ÎÁ ËÕÓÔÕ ÎÅ ÓÏÈÎÅÔ. îÁ éÌØÉÎ
+	ÄÅÎØ ÄÏÖÄØ - ÍÁÌÏ ÐÏÖÁÒÏ×, ×ÅÄÒÏ - ÍÎÏÇÏ. éÌØÑ ÇÒÏÚÙ ÄÅÒÖÉÔ, ÎÁ
+	ÏÇÎÅÎÎÏÊ ËÏÌÅÓÎÉÃÅ ÅÚÄÉÔ. ÷ÏÚÎÅÓÅÎØÅ Ó ÄÏÖÄÅÍ, éÌØÑ Ó ÇÒÏÚÏÊ, ÐÏÔÏÍÕ
+	ÓËÏÔ ÎÅ ×ÙÇÏÎÑÀÔ ÎÁ ÐÏÌÅ. îÁ éÌØÉÎ ÄÅÎØ ÇÄÅ-ÎÉÂÕÄØ ÄÁ ÚÁÇÏÒÁÅÔÓÑ ÏÔ
+	ÇÒÏÚÙ. îÁ éÌØÉÎ ÄÅÎØ ÐÅÒÅÇÏÎÑÀÔ ÐÞÅÌ, ÐÏÄÞÉÝÁÀÔ ÕÌØÑ, ÐÏÄÒÅÚÙ×ÁÀÔ
+	ÐÅÒ×ÙÅ ÓÏÔÙ, ËÏÔÏÒÙÅ, ×ÐÒÏÞÅÍ, ÎÅ × ËÏÒÙÓÔØ; ÏÔÔÏÇÏ ÇÏ×ÏÒÑÔ: ÂÏÇÁÔ
+	ËÁË éÌØÉÎÓËÉÊ ÓÏÔ (ÂÅÄÅÎ).  íÕÈÁ ÄÏ éÌØÉ ËÕÓÁÅÔÓÑ, Á ÐÏÓÌÅ ÚÁÐÁÓÁÅÔÓÑ.
+	ó éÌØÉÎÁ ÄÎÑ ÎÏÞØ ÄÌÉÎÎÁ, Á ×ÏÄÁ ÈÏÌÏÄÎÁ. äÏ éÌØÉ ÍÕÖÉË ËÕÐÁÅÔÓÑ, Á
+	Ó éÌØÉ Ó ÒÅËÏÊ ÐÒÏÝÁÅÔÓÑ. îÁ éÌØÀ Ú×ÅÒØ É ÇÁÄ ÂÒÏÄÑÔ ÐÏ ×ÏÌÅ. ÷
+	éÌØÉÎ ÄÅÎØ ÓÏÂÁË É ËÏÛÅË × ÉÚÂÙ ÎÅ ×ÐÕÓËÁÀÔ (ÂÏÑÓØ ÇÒÏÚÙ).
+	÷Ï ÞÔÏ éÌØÑ, × ÔÏ É ÷ÏÚÄ×ÉÖÅÎØÅ.
+07/22	íÁÒØÉ - ÄÏÂÒÙÊ ÄÅÎØ. ëÏÌÉ ÎÁ íÁÒØÉÎ ÄÅÎØ ÒÏÓÙ,
+	ÔÏ ÌØÎÙ ÂÕÄÕÔ ÓÅÒÙ É ËÏÓÙ.
+07/24	âÏÒÉÓÁ É çÌÅÂÁ - ÇÒÏÚÎÙÈ ÐÁÌÉËÏÐÏ×.
+	îÁ çÌÅÂÁ É âÏÒÉÓÁ ÚÁ ÈÌÅ ÎÅ ÂÅÒÉÓÑ (ÚÁ ÖÎÉÔ×Ï - ÎÅ ÖÎÉ).
+07/25	áÎÎÙ - ÈÏÌÏÄÎÙÅ ÕÔÒÅÎÎÉËÉ. åÓÌÉ ÕÔÒÅÎÎÉË ÈÏÌÏÄÎÙÊ - É ÚÉÍÁ ÈÏÌÏÄÎÁÑ.
+07/27	ðÁÎÔÅÌÅÊÍÏÎÁ ÃÅÌÉÔÅÌÑ, ðÁÌÅÑ, ðÁÌÉËÏÐÙ (Ô.Å. ËÔÏ ÎÁ ÎÅÇÏ ÒÁÂÏÔÁÅÔ,
+	ÇÒÏÚÁ ÓÐÁÌÉÔ ÔÏÇÏ ÈÌÅÂ). îÉËÏÌÁÑ ëÏÞÁÎÎÉËÁ.  ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ
+	ÄÅÎØ ËÁÐÕÓÔÁ Ó×ÅÒÔÙ×ÁÅÔÓÑ × ËÏÞÁÎÙ.
+07/29	ëÁÌÉÎÉÎ ÄÅÎØ. ëÏÌÉ ÎÁ ëÁÌÉÎÉËÁ ÔÕÍÁÎÙ, ÔÏ ÐÒÉÐÁÓÁÊ ËÏÓÙ (ÉÌÉ ÚÁËÒÏÍÁ)
+	ÎÁ Ï×ÅÓ Ó ÑÞÍÅÎÅÍ. ðÒÏÎÅÓÉ, çÏÓÐÏÄÉ, ëÁÌÉÎÉËÁ ÍÏÒÏËÏÍ, Á ÎÅ ÍÏÒÏÚÏÍ.
+07/30	óÉÌÉÎ ÄÅÎØ. îÁ óÉÌÙ É óÅÌÕÑÎÁ ÒÏÖØ ÂÙ×ÁÅÔ ÐØÑÎÁ (Ô.Å. ÐÏÌÎÁ ÚÅÒÎÏÍ
+	É ËÌÏÎÉÔÓÑ Ë ÚÅÍÌÅ). îÁ óÉÌÕ ÒÏÖØ ÐÏÓÅÑÎÎÁÑ ÒÏÄÉÔÓÑ ÓÉÌØÎÏ, Á
+	×ÅÄØÍÙ ÏÂÍÉÒÁÀÔ, ÏÐÉ×ÛÉÓØ ÍÏÌÏËÁ. 
+
+08/01	ðÅÒ×ÙÊ, ÍÏËÒÙÊ, ÍÅÄÏ×ÙÊ óÐÁÓ. ðÞÅÌÉÎÙÊ ÐÒÁÚÄÎÉË. îÁ íÁËÏ×ÅÑ ÓÏÂÉÒÁÀÔ
+	ÍÁË.  äÏÖÄØ ÎÁ íÁËÏ×ÅÑ - ÍÁÌÏ ÐÏÖÁÒÏ×. ÷Ï ÞÔÏ íÁËÏ×ÅÑ, × ÔÏ É
+	ÒÁÚÇÏ×ÅÎØÅ. îÁ ÐÅÒ×ÙÊ óÐÁÓ Ó×ÑÔÉ ËÏÌÏÄÃÙ, ×ÅÎËÉ! îÁ ÍÏËÒÙÊ óÐÁÓ
+	ÌÏÛÁÄÅÊ ËÕÐÁÀÔ, Á ÐÞÅÌÙ ÐÅÒÅÓÔÁÀÔ ÎÏÓÉÔØ ÍÅÄÏ×ÕÀ ×ÚÑÔËÕ.
+08/02	óÔÅÐÁÎÁ óÅÎÏ×ÁÌÁ. ëÁËÏ×Ï ×ÔÏÒÏÅ ÞÉÓÌÏ Á×ÇÕÓÔÁ, ÔÁËÏ× É ÓÅÎÔÑÂÒØ.
+	îÁ óÔÅÐÁÎÁ ÐÏÑÔ ÌÏÛÁÄÅÊ ÞÅÒÅÚ ÓÅÒÅÂÒÏ.
+08/03	éÓÁËÉÑ íÁÌÉÎÎÉËÁ. ëÁËÏ×Ï ÔÒÅÔØÅ ÞÉÓÌÏ Á×ÇÕÓÔÁ, ÔÁËÏ× É ÏËÔÑÂÒØ.
+	îÁ éÓÁËÉÑ ×ÉÈÒÉ - ËÒÕÔÁÑ ÚÉÍÁ.
+08/04	á×ÄÏÔØÉ óÅÎÏÇÎÏÊËÉ. ëÁËÏ×Ï ÞÅÔ×ÅÒÔÏÅ ÞÉÓÌÏ Á×ÇÕÓÔÁ, ÔÁËÏ× É ÎÏÑÂÒØ.
+08/05	å×ÓÉÇÎÅÑ öÉÔÎÉËÁ. ëÁËÏ×Ï ÐÑÔÏÅ ÞÉÓÌÏ Á×ÇÕÓÔÁ, ÔÁËÏ× É ÄÅËÁÂÒØ.
+	÷ ÜÔÏÔ ÄÅÎØ ÚÁËÌÉÎÁÀÔ ÖÉÔÏ, ÏÂÒÁÝÁÑÓØ ÎÁ ×ÓÅ ÞÅÔÙÒÅ ÓÔÏÒÏÎÙ É
+	ÐÒÉÚÙ×ÁÑ íÁÔØ óÙÒÕ úÅÍÌÀ.
+08/06	ñÂÌÏÞÎÙÊ óÐÁÓ. ÷ÔÏÒÏÊ óÐÁÓ ×ÓÅÍÕ ÞÁÓ (ÐÌÏÄÙ ÚÒÅÀÔ), ÛÕÂÕ ÐÒÉÐÁÓ;
+	ÏÓ×ÑÝÁÀÔ ÐÌÏÄÙ É ÍÅÄ, ÅÄÑÔ ÑÂÌÏËÉ, Á ÄÏ ÎÅÇÏ ÔÏÌØËÏ ÏÇÕÒÃÙ.
+	÷ÓÔÒÅÞÁ ÏÓÅÎÉ, ÏÓÅÎÉÎÙ, ÐÒÏ×ÏÄÙ ÚÁËÁÔÁ ÓÏÌÎÃÁ × ÐÏÌÅ Ó ÐÅÓÎÑÍÉ;
+	ÐÏÄÒÅÚÙ×ÁÀÔ ÓÏÔÙ É ÓÎÉÍÁÀÔ ÐÌÏÄÙ. ëÁËÏ×Ï ÛÅÓÔÏÅ ÞÉÓÌÏ Á×ÇÕÓÔÁ,
+	ÔÁËÏ× É ÑÎ×ÁÒØ.
+08/10	ìÁ×ÒÅÎÔÉÑ. ëÏÌÉ ÎÁ ìÁ×ÒÅÎÔØÑ ×ÏÄÁ ÔÉÈÁ, ÔÏ É ÏÓÅÎØ ÂÕÄÅÔ ÔÉÈÁ
+	É ÚÉÍÁ ÎÅ ×ØÀÖÎÁÑ.
+08/15	õÓÐÅÎÝÉÎÁ, çÏÓÐÏÖÉÎËÉ. ëÏÎÅà ÖÁÔ×Ù; ÓËÌÁÄÞÉÎÙ, ÂÒÁÔÓËÏÅ ÐÉ×Ï,
+	ÐÏÓÌÅÄÎÉÊ, ÉÍÅÎÉÎÎÙÊ ÓÎÏÐ. äÏ õÓÐÌÅÎØÑ ÐÁÈÁÔØ - ËÏÐÎÕ ÌÉÛÎÀÀ ÓÁÖÁÔØ.
+	îÁ õÓÐÅÎØÅ ÏÇÕÒÃÙ ÓÏÌÉÔØ, ÎÁ óÅÒÇÉÑ ËÁÐÕÓÔÕ ÒÕÂÉÔØ. íÏÌÏÄÏÅ ÂÁÂØÅ
+	ÌÅÔÏ Ó õÓÐÅÎØÑ ÐÏ óÅÍÅÎ ÄÅÎØ.
+08/16	óÐÁÓ ÎÁ ÐÏÌÏÔÎÅ, ÔÒÅÔÉÊ óÐÁÓ, ÈÌÅÂÎÙÊ óÐÁÓ. ôÒÅÔÉÊ óÐÁÓ ÈÌÅÂÁ ÐÒÉÐÁÓ.
+	ðÅÒ×ÙÊ óÐÁÓ ÎÁ ×ÏÄÅ ÓÔÏÑÔ, ×ÔÏÒÏÊ - ÑÂÌÏËÉ ÅÄÑÔ, ÔÒÅÔÉÊ - ÐÏÌÏÔÎÁ
+	ÐÒÏÄÁÀÔ, ÈÌÅ ÐÒÉÐÁÓÁÀÔ. ìÁÓÔÏÞËÉ ÏÔÌÅÔÁÀÔ × ÔÒÉ ÒÁÚÁ, × ÔÒÉ óÐÁÓÁ.
+08/18	ìÏÛÁÄÉÎÙÊ ÐÒÁÚÄÎÉË, ËÒÏÐÑÔ ÉÈ ÎÁ æÌÏÒÁ É ìÁ×ÒÁ. îÁ ÌÏÛÁÄÑÈ ÎÅ ÒÁÂÏÔÁÀÔ,
+	ÞÔÏ ÐÁÄÅÖÁ ÎÅ ÂÙÌÏ. óÅÊ ÏÚÉÍØ ÏÔ ðÒÅÏÂÒÁÖÅÎÉÑ ÄÏ æÌÏÒÁ, ÞÔÏ ÎÅ ÂÙÌÏ
+	ÆÌÏÒÏ×ÙÈ Ã×ÅÔÉËÏ×. ó æÌÏÒÁ É ìÁ×ÒÁ ÏÓÅÎÎÉÅ ÕÔÒÅÎÎÉËÉ. ó æÌÏÒÏ×Á ÄÎÑ
+	ÚÁÓÉÖÉ×ÁÀÔ ÒÅÔÉ×ÙÅ, Á Ó óÅÍÅÎÁ - ÌÅÎÉ×ÙÅ.
+08/19	óÔÒÁÔÉÌÁ ôÅÐÌÑËÁ.  óÔÒÁÔÉÌÁÔÏ× ÄÅÎØ ÐÒÉÓÐÅÌ, Ï×ÅÓ ÐÏÓÐÅÌ.
+08/22	áÇÁÆÏÎÁ ïÇÕÍÅÎÎÉËÁ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÕ ÎÏÞØ ÌÅÛÉÊ ×ÙÈÏÄÉÔ ÉÚ ÌÅÓÕ
+	É ÂÅÇÁÅÔ ÐÏ ÓÅÌÁÍ É ÄÅÒÅ×ÎÑÍ, ÄÕÒÉÔ É ÒÁÓËÉÄÙ×ÁÅÔ ÓÎÏÐÙ ÐÏ ÇÕÍÎÁÍ.
+	ðÏÜÔÏÍÕ ÅÇÏ ÓÔÅÒÅÇÕÔ, ÔÕÌÕÐ ÎÁÄÅ× ÎÁ×Ù×ÏÒÏÔ É Ó ËÏÞÅÒÇÏÀ × ÒÕËÁÈ.
+08/23	ìÕÐÁ âÒÕÓÎÉÞÎÉËÁ. ìÕÐÏ×ÓËÉÅ ÍÏÒÏÚÙ.
+	îÁ ìÕÐÁ ÍÏÒÏÚ ÌÕÐÉÔ Ï×ÅÓ. ðÅÒ×ÙÅ ÚÁÍÏÒÏÚËÉ.
+08/25	÷ÁÒÆÏÌÏÍÅÅ× ÄÅÎØ. ðÒÉÛÅÌ ÷ÁÒÆÏÌÏÍÅÊ, ÖÉÔÏ ÎÁ ÚÉÍÕ ÓÅÊ.
+08/26	îÁÔÁÌØÉ ï×ÓÑÎÎÉÃÙ. ÷ ÜÔÏÔ ÄÅÎØ ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØ ËÏÓÉÔØ Ï×ÅÓ.
+08/28	áÎÎÙ óËÉÒÄÎÉÃÙ (ÈÌÅ ÓËÌÁÄÙ×ÁÀÔ × ÓËÉÒÄÙ, ÏÄÏÎØÑ É Ô.Ð.).
+08/29	é×ÁÎÁ ðÏÓÔÎÏÇÏ. ÷ ÜÔÏÔ ÄÅÎØ ÎÅ ÅÄÑÔ ÎÉÞÅÇÏ ËÒÕÇÌÏÇÏ: ÑÂÌÏË,
+	ËÁÒÔÏÆÅÌÑ É Ô. Ð. (ÞÔÏ ÎÁÐÏÍÉÎÁÅÔ ÇÏÌÏ×Õ), ÝÅÊ ÎÅ ×ÁÒÑÔ,
+	ÎÅ ÒÕÂÑÔ ËÁÐÕÓÔÙ, ÎÅ ÓÒÅÚÙ×ÁÀÔ ÍÁËÁ, ÎÅ Ò×ÕÔ ÑÂÌÏË, ÎÅ ËÏÐÁÀÔ
+	ËÁÒÔÏÆÅÌÑ, ÎÅ ÂÅÒÕÔ × ÒÕËÉ ËÏÓÁÒÑ, ÔÏÐÏÒÁ É Ô. Ð.
+
+09/01	óÅÍÅÎÁ ìÅÔÏÐÒÏ×ÏÄÃÁ. óÅÍÅÎ ÄÅÎØ. çÒÙÂØÅ, ÂÁÂØÅ, ÓÔÁÒÏÅ ÂÁÂØÅ ÌÅÔÏ.
+	âÁÂØÅ ÌÅÔÏ Ä×Å ÎÅÄÅÌÉ. ó ÂÁÂØÅÇÏ ÌÅÔÁ ÓÅ×ÁÌËÁ Ó ÐÌÅÞ. îÁ óÅÍÅÎ ÄÅÎØ
+	ÄÏ ÏÂÅÄÁ ÐÁÛÉ, Á ÐÏÓÌÅ ÏÂÅÄÁ ÒÕËÁÍÉ ÍÁÛÉ! ðÏÄ óÅÍÅÎ ÄÅÎØ ×ÅÞÅÒÏÍ
+	ÇÁÓÑÔ ÓÔÁÒÙÊ ÏÇÏÎØ, Á ÕÔÒÏÍ ×ÙÔÉÒÁÀÔ ÎÏ×ÙÊ ÉÚ ÄÅÒÅ×Á. îÁÞÁÌÏ ÐÏÓÉÄÅÌÏË,
+	ÚÁÓÉÄÏË, ÓÕÐÒÑÄÏË, ÄÏÓ×ÅÔÏË. ðÅÒÅÈÏÄÉ × óÅÍÅÎ ÄÅÎØ ÎÁ ÎÏ×ÏÓÅÌØÅ -
+	ÓÞÁÓÔØÅ É ×ÅÓÅÌØÅ. îÁ óÅÍÅÎÁ ÐÏÓÔÒÉÇÁÊ É ÎÁ ËÏÎÑ ÓÁÖÁÊ (ÄÉÔÑ), ÎÁ
+	ÌÏ×ÌÀ × ÐÏÌÅ ×ÙÅÚÖÁÊ! ðÅÒ×ÙÊ ÐÒÁÚÄÎÉË ÏÈÏÔÎÉËÏ× Ó ÐÓÁÍÉ. îÁ óÅÍÅÎÁ
+	ÌÁÓÔÏÞËÉ ÌÏÖÁÔÓÑ ×ÅÒÅÎÉÃÁÍÉ × ËÏÌÏÄÃÙ É Ô.Ð., ÍÕÈ É ÔÁÒÁËÁÎÏ× ÈÏÒÏÎÑÔ.
+	ëÏÌÉ ÂÁÂØÅ ÌÅÔÏ ÎÅÎÁÓÔÎÏ - ÏÓÅÎØ ÓÕÈÁÑ, Á ËÏÌÉ ÎÁ óÅÍÅÎÁ ÑÓÎÏ - ÏÓÅÎØ
+	×ÅÄÒÅÎÎÁÑ, ÍÎÏÇÏ ÔÅÎÅÔÎÉËÁ - Ë ÑÓÎÏÊ ÏÓÅÎÉ, Ë ÈÏÌÏÄÎÏÊ ÚÉÍÅ; ÄÉËÉÅ
+	ÇÕÓÉ ÓÁÄÑÔÓÑ, Á ÓË×ÏÒÃÙ ÎÅ ÌÅÔÑÔ.
+09/02	íÁÍÏÎÔÁ ï×ÞÁÒÎÉËÁ.
+09/06	íÉÈÁÊÌÏ× ÄÅÎØ. íÉÈÁÊÌÏ×ÓËÉÅ ÍÏÒÏÚÙ.
+09/08	íÁÌÁÑ ðÒÅÞÉÓÔÁÑ (îÁ õÓÐÅÎØÅ - ÂÏÌØÛÁÑ), áÓÐÁÓÏ× ÄÅÎØ.
+	÷ ÜÔÏÔ ÄÅÎØ ÖÅÎÝÉÎÙ ×ÓÔÒÅÞÁÀÔ ÏÓÅÎØ Õ ×ÏÄÙ (×ÔÏÒÁÑ ×ÓÔÒÅÞÁ ÏÓÅÎÉ).
+	õÂÉÒÁÀÔ ÐÞÅÌ, ÓÏÂÉÒÁÀÔ ÌÕË, ÏÔÔÏÇÏ - ÐÁÓÉËÏ×, ÌÕËÏ× ÄÅÎØ.
+09/11	æÅÄÏÒÙ - ÚÁÍÏÞÉ È×ÏÓÔÙ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÏÓÅÎØ ÅÚÄÉÔ ÎÁ
+	ÇÎÅÄÏÊ ËÏÂÙÌÅ. îÁ æÅÄÏÒÕ ÌÅÔÏ ËÏÎÞÁÅÔÓÑ, ÏÓÅÎØ ÎÁÞÉÎÁÅÔÓÑ. é ÂÁÂØÅ
+	ÌÅÔÏ ÄÏ æÅÄÏÒÙ ÎÅ ×ÓÅÇÄÁ ÄÏÔÑÎÅÔ.
+09/12	ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÚÍÅÉ × ÌÅÓÁÈ ÕÈÏÄÑÔ × ÚÅÍÌÀ.
+09/14	óÄ×ÉÖÅÎÉÅ. îÁ óÄ×ÉÖÅÎÉÅ ËÁÆÔÁÎ Ó ÛÕÂÏÊ ÓÄ×ÉÇÁÀÔÓÑ. îÁ óÄ×ÉÖÅÎÉÅ
+	Õ ÄÏÂÒÏÇÏ ÍÏÌÏÄÃÁ ËÁÐÕÓÔÁ Õ ËÒÙÌØÃÁ.  ëÁÐÕÓÔÅÎÓËÉÅ ×ÅÞÅÒËÉ ÎÁ
+	Ä×Å ÎÅÄÅÌÉ. îÁ ÷ÚÄ×ÉÖÅÎØÅ ÈÌÅÂ Ó ÐÏÌÑ Ä×ÉÎÕÌÓÑ (ÐÏÓÌÅÄÎÑÑ ËÏÐÎÁ
+	Ó ÐÏÌÑ), ÐÔÉÃÁ × ÏÔÌÅÔ Ä×ÉÎÕÌÁÓØ, ÇÁÄ ÎÅ Ä×ÉÖÅÔÓÑ.
+09/15	îÉËÉÔÙ òÅÐÏÒÅÚÁ, çÕÓÑÔÎÉËÁ, çÕÓÅÐÒÏÌÅÔÁ. îÉËÉÔÉÎ ÄÅÎØ. îÅ ÄÒÅÍÌÉ,
+	ÂÁÂÁ, ÎÁ ÒÅÐÏÒÅÚÏ× ÄÅÎØ!  ïÔÌÅÔ ÄÉËÉÈ ÇÕÓÅÊ. óÔÒÉÖËÁ Ï×ÅÃ.
+09/18	å×ÍÅÎÁ. ïÔÌÅÔ ÖÕÒÁ×ÌÅÊ ÎÁ å×ÍÅÎÁ - ÎÁ ðÏËÒÏ× ÍÏÒÏÚ.
+	"ëÏÌÅÓÏÍ ÄÏÒÏÇÁ!" - ËÒÉÞÁÔ ÖÕÒÁ×ÌÑÍ, ÞÔÏ ÉÈ ×ÏÒÏÔÉÔØ
+	(ÞÔÏÂ ÐÏÄÏÌØÛÅ ÏÓÔÁÌÉÓØ É ÚÉÍÁ ÐÏÐÏÚÖÅ ÐÒÉÛÌÁ).
+09/20	áÓÔÁÆØÅ× ÄÅÎØ. ÷ ÜÔÏÔ ÄÅÎØ ÇÁÄÁÀÔ ÐÏ ×ÅÔÒÁÍ Ï ÐÏÇÏÄÅ: ÓÅ×ÅÒÎÙÊ - Ë
+	ÓÔÕÖÅ, ÀÖÎÙÊ - Ë ÔÅÐÌÕ, ÚÁÐÁÄÎÙÊ - Ë ÎÅÎÁÓÔØÀ, Á ×ÏÓÔÏÞÎÙÊ - Ë ×ÅÄÒÕ.
+09/24	æÅËÌÙ úÁÒÅ×ÎÉÃÙ (ÚÁÒÅ×Á ÏÔ ÏÓÅÎÎÉÈ ÏÇÎÅÊ).  éÍÅÎÉÎÎÉË Ï×ÉÎ (ÚÁÍÏÌÏÔËÉ).
+	èÏÚÑÉÎÕ ÈÌÅÂÁ ×ÏÒÏÛÏË, Á ÍÏÌÏÔÉÌØÝÉËÁÍ ËÁÛÉ ÇÏÒÛÏË.
+09/25	óÅÒÇÉÅ× ÄÅÎØ. óÅÒÇÉÑ ëÕÒÑÔÎÉËÁ, ëÁÐÕÓÔÎÉËÁ. åÓÌÉ × ÜÔÏÔ ÄÅÎØ ×ÙÐÁÄÅÔ
+	ÐÅÒ×ÙÊ ÓÎÅÇ, ÔÏ ÚÉÍÁ ÕÓÔÁ×ÉÔÓÑ ÎÁ íÉÈÁÊÌÏ× ÄÅÎØ.  ðÕÔØ ÚÉÍÎÉÊ
+	ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × ÞÅÔÙÒÅ ÓÅÍÉÎÙ (ÓÅÄÍÉÃÙ) ÏÔ óÅÒÇÉÑ.
+09/27	óÁ×ÁÔÅÑ ðÞÅÌØÎÉËÁ. ÷ ÜÔÏÔ ÄÅÎØ ÄÏÌÖÎÏ ÕÂÉÒÁÔØ ÕÌØÑ × ÏÍÛÁÎÉË.
+
+10/01	ðÏËÒÏ×, ÎÁÔÏÐÉ ÉÚÂÕ ÂÅÚ ÄÒÏ×! ðÏËÒÏ× ÎÅ ÌÅÔÏ, ÷ÓÔÒÅÔÅÎØÅ ÎÅ ÚÉÍÁ.
+	ðÅÒ×ÏÅ ÚÁÚÉÍØÅ. îÁ ðÏËÒÏ× ×ÅÔÅÒ Ó ×ÏÓÔÏËÁ Ë ÈÏÌÏÄÎÏÊ ÚÉÍÅ. ðÏËÒÏ×
+	ÚÅÍÌÀ ÐÏËÒÏÅÔ ÔÏ ÌÉÓÔÏÍ, ÔÏ ÓÎÅÖËÏÍ. ðÏËÒÏ× - ËÏÎÅà ÈÏÒÏ×ÏÄÁÍ, ÎÁÞÁÌÏ
+	ÐÏÓÉÄÅÌËÁÍ. âÁÔÀÛËÁ ðÏËÒÏ×, ÐÏËÒÏÊ ÚÅÍÌÀ É ÍÅÎÑ, ÍÏÌÏÄÕ! óÎÅÇ ÎÁ ðÏËÒÏ×
+	- Ë ÓÞÁÓÔØÀ ÍÏÌÏÄÙÍ. îÅ ÐÏËÒÙÌ ðÏËÒÏ×, ÎÅ ÐÏËÒÏÅÔ É òÏÖÄÅÓÔ×Ï.
+	óÐÅÒÅÄÉ - ðÏËÒÏ×, ÓÚÁÄÉ - òÏÖÄÅÓÔ×Ï. úÁÈ×ÁÔÉ ÔÅÐÌÁ ÄÏ ðÏËÒÏ×Á
+	(×ÙÞÉÎÉ ÉÚÂÕ), Á ÎÅ ÚÁÈ×ÁÔÉÛØ ÄÏ ðÏËÒÏ×Á - ÎÅ ÂÕÄÅÔ ÔÁËÏ×Á. õÓÐÅÎØÅ
+	ÚÁÓÅ×ÁÅÔ, Á ðÏËÒÏ× ÓÏÂÉÒÁÅÔ (ÓÂÏÒ ÐÏÓÌÅÄÎÉÈ ÐÌÏÄÏ×). íÅÖÄÕ ðÏËÒÏ×Á
+	É òÏÄÉÔÅÌØÓËÏÊ ÓÕÂÂÏÔÙ ÚÉÍÁ ÎÅ ÓÔÁÎÏ×ÉÔÓÑ.
+10/04	åÒÏÆÅÅ× ÄÅÎØ. ðÏÌÁÇÁÀÔ, ÞÔÏ × ÜÔÏÔ ÄÅÎØ ÌÅÛÉÅ ÄÕÒÑÔ ÐÏ ÌÅÓÁÍ:
+	ÂÒÏÄÑÔ É ËÒÉÞÁÔ, ÈÌÏÐÁÀÔ × ÌÁÄÏÛÉ É ÈÏÈÏÞÕÔ, Á Ë ÕÔÒÕ, ÐÏÓÌÅ
+	ÐÅÎÉÑ ÐÅÒ×ÙÈ ÐÅÔÕÈÏ×, ÐÒÏ×ÁÌÉ×ÁÀÔÓÑ ÓË×ÏÚØ ÚÅÍÌÀ. ðÏÜÔÏÍÕ ÌÀÄÉ
+	× ÌÅÓ ÎÅ ÈÏÄÑÔ: ÌÅÛÉÊ ÂÅÓÉÔÓÑ.
+10/06	æÏÍÁ - ÂÏÌØÛÁÑ ËÒÏÍÁ.
+10/07	óÅÒÇÉÑ. ó óÅÒÇÉÑ ÚÉÍÁ ÐÏÞÉÎÁÅÔÓÑ, Ó íÁÔÒÏÎÙ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ.
+10/09	éÁËÏ×, ÂÒÁÔ âÏÖÉÊ, ËÒÕÐÉÃÕ ÐÏÛÌÅÔ (ÇÒÁÄ, ËÒÕÐÕ).
+10/10	÷ ÜÔÏÔ ÄÅÎØ ÇÁÄÁÀÔ ÐÏ ÍÅÓÑÃÕ Ï ÐÏÇÏÄÅ.
+10/12	÷ ÜÔÏÔ ÄÅÎØ ÇÁÄÁÀÔ ÐÏ Ú×ÅÚÄÁÍ Ï ÐÏÇÏÄÅ É ÕÒÏÖÁÅ.
+10/14	ðÒÁÓËÏ×ØÉ ôÒÅÐÁÌØÎÉÃÙ. ðÏÌÁÇÁÀÔ, ÞÔÏ Ó ÜÔÏÇÏ ÄÎÑ ÄÏÌÖÎÏ ÔÒÅÐÁÔØ ÌÅÎ.
+	ðÒÁÓËÏ×ØÉ ìØÎÑÎÉÃÙ. ðÒÁÓËÏ×ØÉ çÒÑÚÎÉÈÉ, ðÏÒÏÛÉÈÉ. îÁ çÒÑÚÎÉÈÕ ÇÒÑÚØ -
+	ÞÅÔÙÒÅ ÓÍÅÎÙ ÄÏ ÚÉÍÙ. ðÒÁÓËÏ×ØÑ ÐÑÔÎÉÃÁ, èÒÉÓÔÏ×ÙÍ ÓÔÒÁÓÔÑÍ ÐÒÉÞÁÓÔÎÉÃÁ.
+10/22	ëÁÚÁÎÓËÁÑ. ëÏÌÉ ÎÁ ëÁÚÁÎÓËÕÀ ÄÏÖÄØ ÐÏÊÄÅÔ É ×ÓÅ ÌÕÎÏÞËÉ ÎÁÌØÅÔ, ÔÏ
+	ÚÉÍÕ ÓËÏÒÏ ÐÒÉ×ÅÄÅÔ. îÁ ëÁÚÁÎÓËÕÀ ÄÏÂÒÙÅ ÌÀÄÉ ×ÄÁÌØ ÎÅ ÅÚÄÑÔ. ëÔÏ
+	ÎÁ ëÁÚÁÎÓËÏÊ ÖÅÎÉÔÓÑ, ÓÞÁÓÔÌÉ× ÂÕÄÅÔ.
+10/26	äÍÉÔÒÏ× ÄÅÎØ. äÍÉÔÒÏ× ÄÅÎØ ÐÅÒÅ×ÏÚÁ ÎÅ ÖÄÅÔ.  ëÏÌÉ äÍÉÔÒÏ× ÄÅÎØ ÂÕÄÅÔ
+	ÐÏ ÇÏÌÕ, ÔÏ É ó×ÑÔÁÑ, Á ÐÏ ÓÎÅÇÕ - É ó×ÑÔÁÑ ÐÏ ÓÎÅÇÕ.
+	äÍÉÔÒÏ×Á ÓÕÂÂÏÔÁ - ËÕÔÅÊÎÉËÁÍ ÒÁÂÏÔÁ.
+10/28	ðÒÁÓËÏ×ÅÉ ðÑÔÎÉÃÙ, ðÒÁÓËÏ×ÅÉ ìØÎÑÎÉÃÙ (ÍÎÕÔ ÌÅÎ É ÐÒÉÎÏÓÑÔ ÐÅÒ×ÉÎËÕ
+	× ÃÅÒËÏ×Ø). îÁ ðÒÁÓËÏ×ÅÉ ÍÏÌÑÔÓÑ Ï ÈÏÒÏÛÉÈ ÖÅÎÉÈÁÈ.
+10/29	îÁÓÔÁÓØÉ óÔÒÉÇÁÌØÎÉÃÙ. ï×ÞÁÒÎÙÊ ÐÒÁÚÄÎÉË.  ðÏÌÁÇÁÀÔ, ÞÔÏ Ó ÜÔÏÇÏ ÄÎÑ
+	ÄÏÌÖÎÏ ÓÔÒÉÞØ Ï×ÅÃ. á×ÒÁÁÍÉÑ ï×ÞÁÒÁ, îÁÓÔÁÓØÉ ï×ÅÞÎÉÃÙ.
+10/30	àÒÏ×ÁÑ. ðÒÁÚÄÎÉË ÒÙÂÁËÏ× É ÏÈÏÔÎÉËÏ×.
+	ëÏÌÉ ÎÁ àÒÏ×ÕÀ ×ÏÌËÉ ÓÔÁÑÍÉ ÈÏÄÑÔ, ÂÕÄÅÔ ÇÏÌÏÄ, ÍÏÒ ÌÉÂÏ ×ÏÊÎÁ.
+
+11/01	ëÕÚØÍÙ É äÅÍØÑÎÁ. ëÕÒÑÞÉÊ ÐÒÁÚÄÎÉË. îÁ ëÕÚØÍÕ É äÁÍØÑÎÁ ËÕÒÑÞØÉ
+	ÉÍÅÎÉÎÙ, ËÕÒÉÎÁÑ ÓÍÅÒÔØ. îÁ ëÏÚØÍÕ É äÅÍØÑÎÁ ËÕÒÉÃÕ ÎÁ ÓÔÏÌ, ÃÙÐÌÅÎËÁ
+	ÐÏÐÕ. åÓÌÉ ëÕÚØÍÁ É äÅÍØÑÎ Ó ÍÏÓÔÏÍ, ÔÏ îÉËÏÌÁ Ó Ç×ÏÚÄÅÍ, Á ÔÏ É ÓÁÍ Ó
+	Ç×ÏÚÄÅÍ (ÎÁÞÁÌÏ ÚÉÍÙ).  ëÏÌÉ ëÕÚØÍÁ É äÅÍØÑÎ ÚÁËÕÅÔ, ÔÏ íÉÈÁÉÌ (8-ÇÏ)
+	ÒÁÓËÕÅÔ (ÏÔÔÅÐÅÌÉ).
+	îÁ ëÕÚØÍÕ É äÅÍØÑÎÁ ÌÉÓÔ ÎÁ ÄÅÒÅ×Å - ÞÅÒÅÚ ÇÏÄ ÍÏÒÏÚ.
+11/08	íÉÈÁÊÌÏ× ÄÅÎØ. íÉÈÁÊÌÏ×ÓËÉÅ ÚÁÍÏÒÏÚËÉ. äÅÎØ áÒÈÉÓÔÒÁÔÉÇÁ Ó ÐÏÌÕÍÏÓÔÏÍ.
+	ó íÉÈÁÉÌÁ ÚÉÍÁ ÎÅ ÓÔÏÉÔ, ÚÅÍÌÑ ÎÅ ÍÅÒÚÎÅÔ. íÉÈÁÊÌÏ×ÓËÉÅ ÏÔÔÅÐÅÌÉ,
+	ÇÒÑÚÉ. ÷Ï ÞÔÏ íÉÈÁÉÌÁ, × ÔÏ É îÉËÏÌÁ. ó íÉÈÁÉÌÁ ÚÉÍÁ ÍÏÒÏÚÙ ËÕÅÔ.
+11/09	íÁÔÒÅÎÉÎ ÄÅÎØ. ó ÚÉÍÎÅÊ íÁÔÒÅÎÙ ÚÉÍÁ ×ÓÔÁÅÔ ÎÁ ÎÏÇÉ, ÎÁÌÅÔÁÀÔ ÍÏÒÏÚÙ.
+	ó óÅÒÇÉÑ (25 ÓÅÎÔÑÂÒÑ) ÚÉÍÁ ÐÏÞÉÎÁÅÔÓÑ, Ó íÁÔÒÅÎÙ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ.
+	éÎÅÊ ÎÁ íÁÔÒÅÎÕ ÎÁ ÄÅÒÅ×ØÑÈ - Ë ÍÏÒÏÚÁÍ, ÔÕÍÁÎ - Ë ÏÔÔÅÐÅÌÑÍ.
+11/11	æÅÄÏÒÁ óÔÕÄÉÔÁ. óÏ ÄÎÑ æÅÄÏÒÁ óÔÕÄÉÔÁ ÓÔÁÌÏ ÈÏÌÏÄÎÏ É ÓÅÒÄÉÔÏ.
+	æÅÄÏÒ óÔÕÄÉÔ ÚÅÍÌÀ ÓÔÕÄÉÔ.
+11/12	éÏÁÎÎÁ íÉÌÏÓÔÉ×ÏÇÏ. äÏÖÄØ ÎÁ íÉÌÏÓÔÉ×ÏÇÏ - ÏÔÔÅÐÅÌÉ ÄÏ ÷×ÅÄÅÎÉÑ.
+11/14	éÎÅÊ ÎÁ æÉÌÉÐÐÁ - ÕÒÏÖÁÊ ÎÁ Ï×ÅÓ.
+11/15	çÕÒÉÑ.  çÕÒÉÊ ÎÁ ÐÅÇÏÊ ËÏÂÙÌÅ (ÇÒÑÚØ ÌÉÂÏ ÓÎÅÇ).
+11/17	ðÒÉÅÈÁÌÁ ÚÉÍÁ ÎÁ ÐÅÇÏÊ ËÏÂÙÌÅ.
+11/18	òÏÍÁÎÁ. ëÁËÏ× ðÌÁÔÏÎ ÄÁ òÏÍÁÎ, ÔÁËÏ×Á É ÚÉÍÁ.
+11/24	ëÁÔÅÒÉÎÉÎ ÄÅÎØ. ðÅÒ×ÏÅ ËÁÔÁÎÉÅ ÎÁ ÓÁÎÑÈ.
+11/26	àÒØÅ× ÄÅÎØ ÏÓÅÎÎÉÊ. ÷ÏÔ ÔÅÂÅ, ÂÁÂÕÛËÁ, É àÒØÅ× ÄÅÎØ! óÒÏË ÐÅÒÅÈÏÄÁ
+	ËÒÅÓÔØÑÎ ÐÒÉ ÃÁÒÅ âÏÒÉÓÅ. ëÒÅÐËÉ ÒÑÄÙ àÒØÅ×ÙÍ ÄÎÅÍ. íÕÖÉË É ÂÏÌÉÔ, É
+	ÓÏÈÎÅÔ ÐÏ àÒØÅ× ÄÅÎØ. íÕÖÉË ÎÅ ÔÕÖÉÔ, ÚÎÁÅÔ, ËÏÇÄÁ àÒØÑ. àÒÉÊ ÈÏÌÏÄÎÙÊ
+	ÏÂÒÏË ÓÏÂÉÒÁÅÔ. àÒØÅ×ÓËÉÊ ÏÂÒÏË. ïÓÅÎØÀ àÒÉÊ Ó ÍÏÓÔÏÍ, îÉËÏÌÁ Ó ç×ÏÚÄÅÍ.
+11/30	áÎÄÒÅÑ. áÎÄÒÅÀ ÍÏÌÑÔÓÑ Ï ÈÏÒÏÛÉÈ ÖÅÎÉÈÁÈ. îÁÓÌÕÛÉ×ÁÀÔ ×ÏÄÕ: ËÏÌÉ
+	ÔÉÈÁ - ÈÏÒÏÛÁÑ ÚÉÍÁ, ËÏÌÉ ÛÕÍÎÁ - ÍÏÒÏÚÙ, ÂÕÒÉ É ×ØÀÇÉ.
+
+12/01	îÁÕÍÁ ÇÒÁÍÏÔÎÉËÁ. âÁÔÀÛËÁ îÁÕÍ, ÎÁ×ÅÄÉ ÎÁ ÕÍ! ÷ ÜÔÏÔ ÄÅÎØ ÎÁÞÉÎÁÀÔ
+	ÕÞÉÔØ ÄÅÔÅÊ ÇÒÁÍÏÔÅ.
+12/04	÷ÁÒ×ÁÒÉÎ ÄÅÎØ.  ÷ÁÒ×ÁÒÉÎÙ ÍÏÒÏÚÙ. ôÒÅÝÉÔ ÷ÁÒÕÈÁ, ÂÅÒÅÇÉ ÎÏÓ ÄÁ ÕÈÏ!
+	÷ÁÒ×ÁÒÁ ÚÁ×ÁÒÉÔ, óÁ×Á ÚÁÓÁÌÉÔ, îÉËÏÌÁ ÚÁÇ×ÏÚÄÉÔ. ÷ÁÒ×ÁÒÁ ÎÏÞÉ ÕÒ×ÁÌÁ,
+	ÕËÒÁÌÁ, ÄÅÎØ ÐÒÉÔÏÞÉÌÁ.
+12/05	óÁ×ÉÎ ÄÅÎØ. óÁ×Á ÓÔÅÌÅÔ, Ç×ÏÚÄÉ ÏÓÔÒÉÔ, ÚÁÓÁÌÉÔ.
+12/06	îÉËÏÌÁ ÚÉÍÎÉÊ, ÍÏÒÏÚÎÙÊ. ä×Á îÉËÏÌÙ: ÏÄÉÎ ÔÒÁ×ÎÙÊ, ÄÒÕÇÏÊ ÍÏÒÏÚÎÙÊ;
+	ÉÌÉ: ÏÄÉÎ Ó ÔÒÁ×ÏÊ, ÄÒÕÇÏÊ Ó ÚÉÍÏÊ. îÉËÏÌÁ ÚÉÍÎÉÊ ÌÏÛÁÄØ ÎÁ Ä×ÏÒ
+	ÚÁÇÏÎÉÔ, Á ÌÅÔÎÉÊ ÏÔËÏÒÍÉÔ. åÇÏÒÉÊ Ó ÍÏÓÔÏÍ, Á îÉËÏÌÁ Ó Ç×ÏÚÄÅÍ.
+	åÇÏÒÉÊ ÍÏÓÔÉÔ, îÉËÏÌÁ Ç×ÏÚÄÉÔ. îÉËÏÌØÓËÉÅ ÍÏÒÏÚÙ. úÉÍÁ ÎÁ îÉËÏÌÕ
+	ÚÁÍÅÔÁÅÔ - ÄÏÒÏÇÉ ÎÅ ÂÙ×ÁÅÔ. è×ÁÌÉÓØ ÚÉÍÏÊ ÐÏ îÉËÏÌÅ! ëÒÁÓÎÁ îÉËÏÌØÛÉÎÁ
+	ÐÉ×ÏÍ ÄÁ ÐÉÒÏÇÁÍÉ. îÉËÏÌØÓËÕÀ ÂÒÁÇÕ ÐØÀÔ, Á ÚÁ ÐÏÈÍÅÌØÅ ÂØÀÔ. îÉËÏÌÁ
+	ÓÔÒÏÉÔ ÃÅÎÕ ÎÁ ÈÌÅÂ. âÌÁÇÏÍÕ þÕÄÏÔ×ÏÒÃÕ Ä×Á ÐÒÁÚÄÎÉËÁ × ÇÏÄ, Á ëÁÓØÑÎÕ
+	îÅÍÉÌÏÓÔÉ×ÏÍÕ - × ÞÅÔÙÒÅ ÇÏÄÁ ÏÄÉÎ. ÷ÓÅÍ ÂÏÇÁÍ ÐÏ ÓÁÐÏÇÁÍ, Á îÉËÏÌÅ
+	ÂÏÌÅ, ÚÁ ÔÅÍ, ÞÔÏ ÈÏÄÉÔ ÄÏÌÅ, Á ÜÔÏ ÐÏÔÏÍÕ, ÞÔÏ ÏÔ èÏÌÍÏÇÏÒ ÄÏ ëÏÌÙ
+	ÔÒÉÄÃÁÔØ ÔÒÉ îÉËÏÌÙ.
+12/09	úÁÞÁÔÉÅ. âÅÒÅÍÅÎÎÙÍ ÂÁÂÁÍ ÐÏÓÔ.
+	îÁ úÁÞÁÔÉÅ ×ÏÌËÉ ÓÈÏÄÑÔÓÑ, Á ÐÏÓÌÅ ëÒÅÝÅÎØÑ ÒÁÚÂÅÇÁÀÔÓÑ.
+12/12	óÐÉÒÉÄÏÎÁ ðÏ×ÏÒÏÔÁ. óÏÌÎÃÅ ÎÁ ÌÅÔÏ, Á ÚÉÍÁ ÎÁ ÍÏÒÏÚ. ðÏÌÁÇÁÀÔ, ÞÔÏ ×
+	ÜÔÏÔ ÄÅÎØ ÍÅÄ×ÅÄØ ÐÏ×ÅÒÎÅÔÓÑ ÎÁ ÄÒÕÇÏÊ ÂÏË É ËÏÒÏ×Á ÎÁ ÓÏÌÎÃÅ ÎÁÇÒÅÅÔ
+	ÏÄÉÎ ÂÏË. ó óÏÌÎÃÅ×ÏÒÏÔÁ ÄÎÑ ÐÒÉÂÕÄÅÔ ÈÏÔØ ÎÁ ×ÏÒÏÂØÉÎÙÊ ÓËÏË. ëÏÒÍÑÔ
+	ËÕÒ ÇÒÅÞÉÈÏÊ ÉÚ ÐÒÁ×ÏÇÏ ÒÕËÁ×Á, ÞÔÏ ÒÁÎØÛÅ ÎÅÓÌÉÓØ ÏÎÉ. óÐÉÒÉÄÏÎÏ×
+	ÄÅÎØ, ÐÏÄÙÍÁÊÓÑ ××ÅÒÈ! - ÐÒÉÇÏ×ÁÒÉ×ÁÀÔ ÓÁÄÏ×ÎÉËÉ, ×ÓÔÒÑÈÉ×ÁÑ ÑÂÌÏËÉ.
+12/24	÷ ÜÔÏÔ ÄÅÎØ Ó ×ÅÞÅÒÁ ÐÏÀÔ ËÏÌÑÄÕ.
+12/25	ó×ÑÔËÉ. ôÅÍÎÙÅ ó×ÑÔËÉ - ÍÏÌÏÞÎÙÅ ËÏÒÏ×Ù, Ó×ÅÔÌÙÅ - ÎÏÓËÉÅ ËÕÒÙ.
+	îÅÂÏ Ú×ÅÚÄÉÓÔÏ - Ë ÇÏÒÏÈÕ, ÍÅÔÅÌØ - ÐÞÅÌÙ ÒÏÉÔØÓÑ ÂÕÄÕÔ, ÉÎÅÊ - Ë
+	ÕÒÏÖÁÀ ÈÌÅÂÁ, ÐÕÔØ ÈÏÒÏÛ - Ë ÕÒÏÖÁÀ ÇÒÅÞÉ.
+	îÅ ÎÁÄÅ×ÁÊ ÞÉÓÔÏÊ ÒÕÂÁÈÉ, Á ÔÏ ÖÄÉ ÎÅÕÒÏÖÁÑ.
+12/30	áÎÉÓØÉ öÅÌÕÄÏÞÎÉÃÙ: × ÜÔÏÔ ÄÅÎØ ÇÁÄÁÀÔ ÐÏ Ó×ÉÎÏÊ ÐÅÞÅÎÉ Ï ÚÉÍÅ.
+12/31	íÅÌÁÎËÉ. ýÅÄÒÙÊ ×ÅÞÅÒ, ÷ÁÓÉÌØÅ× ×ÅÞÅÒ. ó×ÉÎËÕ ÄÁ ÂÏÒÏ× ÄÌÑ ÷ÁÓÉÌØÅ×Á
+	×ÅÞÅÒËÁ. á×ÓÅÎØ. ôÁÕÓÅÎØ.  çÁÄÁÎÉÑ. ÷ÁÓÉÌØÅ×Á ÎÏÞØ Ú×ÅÚÄÉÓÔÁ - ÌÅÔÏ
+	ÑÇÏÄÉÓÔÏ. ðÏÄ ÷ÁÓÉÌØÑ ×ÅÄØÍÙ ËÒÁÄÕÔ ÍÅÓÑÃ.
+
+CALENDAR=
diff --git a/src/usr.bin/calendar/day.c b/src/usr.bin/calendar/day.c
new file mode 100644
index 0000000..4a164ba
--- /dev/null
+++ b/src/usr.bin/calendar/day.c
@@ -0,0 +1,714 @@
+/*	$OpenBSD: day.c,v 1.27 2013/11/26 13:18:53 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/uio.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <tzfile.h>
+
+#include "pathnames.h"
+#include "calendar.h"
+
+extern struct iovec header[];
+
+#define WEEKLY 1
+#define MONTHLY 2
+#define YEARLY 3
+
+struct tm *tp;
+int *cumdays, offset;
+char dayname[10];
+enum calendars calendar;
+u_long julian;
+
+
+/* 1-based month, 0-based days, cumulative */
+int daytab[][14] = {
+	{ 0, -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364 },
+	{ 0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
+};
+
+static char *days[] = {
+	"sun", "mon", "tue", "wed", "thu", "fri", "sat", NULL,
+};
+
+static char *months[] = {
+	"jan", "feb", "mar", "apr", "may", "jun",
+	"jul", "aug", "sep", "oct", "nov", "dec", NULL,
+};
+
+static struct fixs fndays[8];         /* full national days names */
+static struct fixs ndays[8];          /* short national days names */
+
+static struct fixs fnmonths[13];      /* full national months names */
+static struct fixs nmonths[13];       /* short national month names */
+
+void
+setnnames(void)
+{
+	char buf[80];
+	int i, l;
+	struct tm tm;
+
+	for (i = 0; i < 7; i++) {
+		tm.tm_wday = i;
+		l = strftime(buf, sizeof(buf), "%a", &tm);
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
+			;
+		buf[l] = '\0';
+		if (ndays[i].name != NULL)
+			free(ndays[i].name);
+		if ((ndays[i].name = strdup(buf)) == NULL)
+			err(1, NULL);
+		ndays[i].len = strlen(buf);
+
+		l = strftime(buf, sizeof(buf), "%A", &tm);
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
+			;
+		buf[l] = '\0';
+		if (fndays[i].name != NULL)
+			free(fndays[i].name);
+		if ((fndays[i].name = strdup(buf)) == NULL)
+			err(1, NULL);
+		fndays[i].len = strlen(buf);
+	}
+
+	for (i = 0; i < 12; i++) {
+		tm.tm_mon = i;
+		l = strftime(buf, sizeof(buf), "%b", &tm);
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
+			;
+		buf[l] = '\0';
+		if (nmonths[i].name != NULL)
+			free(nmonths[i].name);
+		if ((nmonths[i].name = strdup(buf)) == NULL)
+			err(1, NULL);
+		nmonths[i].len = strlen(buf);
+
+		l = strftime(buf, sizeof(buf), "%B", &tm);
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
+			;
+		buf[l] = '\0';
+		if (fnmonths[i].name != NULL)
+			free(fnmonths[i].name);
+		if ((fnmonths[i].name = strdup(buf)) == NULL)
+			err(1, NULL);
+		fnmonths[i].len = strlen(buf);
+	}
+	/* Hardwired special events */
+	spev[0].name = strdup(PESACH);
+	spev[0].nlen = PESACHLEN;
+	spev[0].getev = pesach;
+	spev[1].name = strdup(EASTER);
+	spev[1].nlen = EASTERNAMELEN;
+	spev[1].getev = easter;
+	spev[2].name = strdup(PASKHA);
+	spev[2].nlen = PASKHALEN;
+	spev[2].getev = paskha;
+	for (i = 0; i < NUMEV; i++) {
+		if (spev[i].name == NULL)
+			err(1, NULL);
+		spev[i].uname = NULL;
+	}
+}
+
+void
+settime(time_t *now)
+{
+	tp = localtime(now);
+	tp->tm_sec = 0;
+	tp->tm_min = 0;
+	/* Avoid getting caught by a timezone shift; set time to noon */
+	tp->tm_isdst = 0;
+	tp->tm_hour = 12;
+	*now = mktime(tp);
+	if (isleap(tp->tm_year + TM_YEAR_BASE))
+		cumdays = daytab[1];
+	else
+		cumdays = daytab[0];
+	/* Friday displays Monday's events */
+	offset = tp->tm_wday == 5 ? 3 : 1;
+	if (f_SetdayAfter)
+		offset = 0;	/* Except not when range is set explicitly */
+	header[5].iov_base = dayname;
+
+	(void) setlocale(LC_TIME, "C");
+	header[5].iov_len = strftime(dayname, sizeof(dayname), "%A", tp);
+	(void) setlocale(LC_TIME, "");
+
+	setnnames();
+}
+
+/* convert [Year][Month]Day into unix time (since 1970)
+ * Year: two or four digits, Month: two digits, Day: two digits
+ */
+time_t
+Mktime(char *date)
+{
+	time_t t;
+	int len;
+	struct tm tm;
+
+	(void)time(&t);
+	tp = localtime(&t);
+
+	len = strlen(date);
+	if (len < 2)
+		return((time_t)-1);
+	bzero(&tm, sizeof tm);
+	tm.tm_sec = 0;
+	tm.tm_min = 0;
+	/* Avoid getting caught by a timezone shift; set time to noon */
+	tm.tm_isdst = 0;
+	tm.tm_hour = 12;
+	tm.tm_wday = 0;
+	tm.tm_mday = tp->tm_mday;
+	tm.tm_mon = tp->tm_mon;
+	tm.tm_year = tp->tm_year;
+
+	/* Day */
+	tm.tm_mday = atoi(date + len - 2);
+
+	/* Month */
+	if (len >= 4) {
+		*(date + len - 2) = '\0';
+		tm.tm_mon = atoi(date + len - 4) - 1;
+	}
+
+	/* Year */
+	if (len >= 6) {
+		*(date + len - 4) = '\0';
+		tm.tm_year = atoi(date);
+
+		/* tm_year up TM_YEAR_BASE ... */
+		if (tm.tm_year < 69)		/* Y2K */
+			tm.tm_year += 2000 - TM_YEAR_BASE;
+		else if (tm.tm_year < 100)
+			tm.tm_year += 1900 - TM_YEAR_BASE;
+		else if (tm.tm_year > TM_YEAR_BASE)
+			tm.tm_year -= TM_YEAR_BASE;
+	}
+
+#if DEBUG
+	printf("Mktime: %d %lld %d %s\n", (int)mktime(&tm), (long long)t, len,
+	    asctime(&tm));
+#endif
+	return(mktime(&tm));
+}
+
+static void
+adjust_calendar(int *day, int *month)
+{
+	switch (calendar) {
+	case GREGORIAN:
+		break;
+
+	case JULIAN:
+		*day += julian;
+		if (*day > (cumdays[*month + 1] - cumdays[*month])) {
+			*day -= (cumdays[*month + 1] - cumdays[*month]);
+			if (++*month > 12)
+				*month = 1;
+		}
+		break;
+	case LUNAR:
+		break;
+	}
+}
+
+/*
+ * Possible date formats include any combination of:
+ *	3-charmonth			(January, Jan, Jan)
+ *	3-charweekday			(Friday, Monday, mon.)
+ *	numeric month or day		(1, 2, 04)
+ *
+ * Any character except \t or '*' may separate them, or they may not be
+ * separated.  Any line following a line that is matched, that starts
+ * with \t, is shown along with the matched line.
+ */
+struct match *
+isnow(char *endp, int bodun)
+{
+	int day = 0, flags = 0, month = 0, v1, v2, i;
+	int monthp, dayp, varp = 0;
+	struct match *matches = NULL, *tmp, *tmp2;
+	int interval = YEARLY;	/* how frequently the event repeats. */
+	int vwd = 0;	/* Variable weekday */
+	time_t tdiff, ttmp;
+	struct tm tmtmp;
+
+	/*
+	 * CONVENTION
+	 *
+	 * Month:     1-12
+	 * Monthname: Jan .. Dec
+	 * Day:       1-31
+	 * Weekday:   Mon-Sun
+	 *
+	 */
+
+	/* read first field */
+	/* didn't recognize anything, skip it */
+	if (!(v1 = getfield(endp, &endp, &flags)))
+		return (NULL);
+
+	/* adjust bodun rate */
+	if (bodun && !bodun_always)
+		bodun = !arc4random_uniform(3);
+		
+	/* Easter or Easter depending days */
+	if (flags & F_SPECIAL)
+		vwd = v1;
+
+	 /*
+	  * 1. {Weekday,Day} XYZ ...
+	  *
+	  *    where Day is > 12
+	  */
+	else if (flags & F_ISDAY || v1 > 12) {
+
+		/* found a day; day: 13-31 or weekday: 1-7 */
+		day = v1;
+
+		/* {Day,Weekday} {Month,Monthname} ... */
+		/* if no recognizable month, assume just a day alone -- this is
+		 * very unlikely and can only happen after the first 12 days.
+		 * --find month or use current month */
+		if (!(month = getfield(endp, &endp, &flags))) {
+			month = tp->tm_mon + 1;
+			/* F_ISDAY is set only if a weekday was spelled out */
+			/* F_ISDAY must be set if 0 < day < 8 */
+			if ((day <= 7) && (day >= 1))
+				interval = WEEKLY;
+			else
+				interval = MONTHLY;
+		} else if ((day <= 7) && (day >= 1))
+			day += 10;
+			/* it's a weekday; make it the first one of the month */
+		if (month == -1) {
+			month = tp->tm_mon + 1;
+			interval = MONTHLY;
+		} else if (calendar)
+			adjust_calendar(&day, &month);
+		if ((month > 12) || (month < 1))
+			return (NULL);
+	}
+
+	/* 2. {Monthname} XYZ ... */
+	else if (flags & F_ISMONTH) {
+		month = v1;
+		if (month == -1) {
+			month = tp->tm_mon + 1;
+			interval = MONTHLY;
+		}
+		/* Monthname {day,weekday} */
+		/* if no recognizable day, assume the first day in month */
+		if (!(day = getfield(endp, &endp, &flags)))
+			day = 1;
+		/* If a weekday was spelled out without an ordering,
+		 * assume the first of that day in the month */
+		if ((flags & F_ISDAY)) {
+			if ((day >= 1) && (day <=7))
+				day += 10;
+		} else if (calendar)
+			adjust_calendar(&day, &month);
+	}
+
+	/* Hm ... */
+	else {
+		v2 = getfield(endp, &endp, &flags);
+
+		/*
+		 * {Day} {Monthname} ...
+		 * where Day <= 12
+		 */
+		if (flags & F_ISMONTH) {
+			day = v1;
+			month = v2;
+			if (month == -1) {
+				month = tp->tm_mon + 1;
+				interval = MONTHLY;
+			} else if (calendar)
+				adjust_calendar(&day, &month);
+		}
+
+		/* {Month} {Weekday,Day} ...  */
+		else {
+			/* F_ISDAY set, v2 > 12, or no way to tell */
+			month = v1;
+			/* if no recognizable day, assume the first */
+			day = v2 ? v2 : 1;
+			if ((flags & F_ISDAY)) {
+				if ((day >= 1) && (day <= 7))
+					day += 10;
+			} else
+				adjust_calendar(&day, &month);
+		}
+	}
+
+	/* convert Weekday into *next*  Day,
+	 * e.g.: 'Sunday' -> 22
+	 *       'SundayLast' -> ??
+	 */
+	if (flags & F_ISDAY) {
+#if DEBUG
+		fprintf(stderr, "\nday: %d %s month %d\n", day, endp, month);
+#endif
+
+		varp = 1;
+		/* variable weekday, SundayLast, MondayFirst ... */
+		if (day < 0 || day >= 10)
+			vwd = day;
+		else {
+			day = tp->tm_mday + (((day - 1) - tp->tm_wday + 7) % 7);
+			interval = WEEKLY;
+		}
+	} else
+	/* Check for silliness.  Note we still catch Feb 29 */
+		if (!(flags & F_SPECIAL) &&
+		    (day > (cumdays[month + 1] - cumdays[month]) || day < 1)) {
+			if (!((month == 2 && day == 29) ||
+			    (interval == MONTHLY && day <= 31)))
+				return (NULL);
+		}
+
+	if (!(flags & F_SPECIAL)) {
+		monthp = month;
+		dayp = day;
+		day = cumdays[month] + day;
+#if DEBUG
+		fprintf(stderr, "day2: day %d(%d) yday %d\n", dayp, day, tp->tm_yday);
+#endif
+	/* Speed up processing for the most common situation:  yearly events
+	 * when the interval being checked is less than a month or so (this
+	 * could be less than a year, but then we have to start worrying about
+	 * leap years).  Only one event can match, and it's easy to find.
+	 * Note we can't check special events, because they can wander widely.
+	 */
+		if (((v1 = offset + f_dayAfter) < 50) && (interval == YEARLY)) {
+			memcpy(&tmtmp, tp, sizeof(struct tm));
+			tmtmp.tm_mday = dayp;
+			tmtmp.tm_mon = monthp - 1;
+			if (vwd) {
+			/* We want the event next year if it's late now
+			 * this year.  The 50-day limit means we don't have to
+			 * worry if next year is or isn't a leap year.
+			 */
+				if (tp->tm_yday > 300 && tmtmp.tm_mon <= 1)
+					variable_weekday(&vwd, tmtmp.tm_mon + 1,
+					    tmtmp.tm_year + TM_YEAR_BASE + 1);
+				else
+					variable_weekday(&vwd, tmtmp.tm_mon + 1,
+					    tmtmp.tm_year + TM_YEAR_BASE);
+				day = cumdays[tmtmp.tm_mon + 1] + vwd;
+				tmtmp.tm_mday = vwd;
+			}
+			v2 = day - tp->tm_yday;
+			if ((v2 > v1) || (v2 < 0)) {
+				if ((v2 += isleap(tp->tm_year + TM_YEAR_BASE) ? 366 : 365)
+				    <= v1)
+					tmtmp.tm_year++;
+				else if(!bodun || (day - tp->tm_yday) != -1)
+					return(NULL);
+			}
+			if ((tmp = malloc(sizeof(struct match))) == NULL)
+				err(1, NULL);
+
+			if (bodun && (day - tp->tm_yday) == -1) {
+				tmp->when = f_time - 1 * SECSPERDAY;
+				tmtmp.tm_mday++;
+				tmp->bodun = 1;
+			} else {
+				tmp->when = f_time + v2 * SECSPERDAY;
+				tmp->bodun = 0;
+			}
+
+			(void)mktime(&tmtmp);
+			if (strftime(tmp->print_date,
+			    sizeof(tmp->print_date),
+			/*    "%a %b %d", &tm);  Skip weekdays */
+			    "%b %d", &tmtmp) == 0)
+				tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
+
+			tmp->var   = varp;
+			tmp->next  = NULL;
+			return(tmp);
+		}
+	} else {
+		varp = 1;
+		/* Set up v1 to the event number and ... */
+		v1 = vwd % (NUMEV + 1) - 1;
+		vwd /= (NUMEV + 1);
+		if (v1 < 0) {
+			v1 += NUMEV + 1;
+			vwd--;
+		}
+		dayp = monthp = 1;	/* Why not */
+	}
+
+	/* Compare to past and coming instances of the event.  The i == 0 part
+	 * of the loop corresponds to this specific instance.  Note that we
+	 * can leave things sort of higgledy-piggledy since a mktime() happens
+	 * on this before anything gets printed.  Also note that even though
+	 * we've effectively gotten rid of f_dayBefore, we still have to check
+	 * the one prior event for situations like "the 31st of every month"
+	 * and "yearly" events which could happen twice in one year but not in
+	 * the next */
+	tmp2 = matches;
+	for (i = -1; i < 2; i++) {
+		memcpy(&tmtmp, tp, sizeof(struct tm));
+		tmtmp.tm_mday = dayp;
+		tmtmp.tm_mon = month = monthp - 1;
+		do {
+			v2 = 0;
+			switch (interval) {
+			case WEEKLY:
+				tmtmp.tm_mday += 7 * i;
+				break;
+			case MONTHLY:
+				month += i;
+				tmtmp.tm_mon = month;
+				switch(tmtmp.tm_mon) {
+				case -1:
+					tmtmp.tm_mon = month = 11;
+					tmtmp.tm_year--;
+					break;
+				case 12:
+					tmtmp.tm_mon = month = 0;
+					tmtmp.tm_year++;
+					break;
+				}
+				if (vwd) {
+					v1 = vwd;
+					variable_weekday(&v1, tmtmp.tm_mon + 1,
+					    tmtmp.tm_year + TM_YEAR_BASE);
+					tmtmp.tm_mday = v1;
+				} else
+					tmtmp.tm_mday = dayp;
+				break;
+			case YEARLY:
+			default:
+				tmtmp.tm_year += i;
+				if (flags & F_SPECIAL) {
+					tmtmp.tm_mon = 0;	/* Gee, mktime() is nice */
+					tmtmp.tm_mday = spev[v1].getev(tmtmp.tm_year +
+					    TM_YEAR_BASE) + vwd;
+				} else if (vwd) {
+					v1 = vwd;
+					variable_weekday(&v1, tmtmp.tm_mon + 1,
+					    tmtmp.tm_year + TM_YEAR_BASE);
+					tmtmp.tm_mday = v1;
+				} else {
+				/* Need the following to keep Feb 29 from
+				 * becoming Mar 1 */
+				tmtmp.tm_mday = dayp;
+				tmtmp.tm_mon = monthp - 1;
+				}
+				break;
+			}
+			/* How many days apart are we */
+			if ((ttmp = mktime(&tmtmp)) == -1)
+				warnx("time out of range: %s", endp);
+			else {
+				tdiff = difftime(ttmp, f_time)/ SECSPERDAY;
+				if (tdiff <= offset + f_dayAfter ||
+				    (bodun && tdiff == -1)) {
+					if (tdiff >=  0 ||
+					    (bodun && tdiff == -1)) {
+					if ((tmp = malloc(sizeof(struct match))) == NULL)
+						err(1, NULL);
+					tmp->when = ttmp;
+					if (strftime(tmp->print_date,
+					    sizeof(tmp->print_date),
+					/*    "%a %b %d", &tm);  Skip weekdays */
+					    "%b %d", &tmtmp) == 0)
+						tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
+					tmp->bodun = bodun && tdiff == -1;
+					tmp->var   = varp;
+					tmp->next  = NULL;
+					if (tmp2)
+						tmp2->next = tmp;
+					else
+						matches = tmp;
+					tmp2 = tmp;
+					v2 = (i == 1) ? 1 : 0;
+					}
+				} else
+					i = 2; /* No point checking in the future */
+			}
+		} while (v2 != 0);
+	}
+	return (matches);
+}
+
+
+int
+getmonth(char *s)
+{
+	char **p;
+	struct fixs *n;
+
+	for (n = fnmonths; n->name; ++n)
+		if (!strncasecmp(s, n->name, n->len))
+			return ((n - fnmonths) + 1);
+	for (n = nmonths; n->name; ++n)
+		if (!strncasecmp(s, n->name, n->len))
+			return ((n - nmonths) + 1);
+	for (p = months; *p; ++p)
+		if (!strncasecmp(s, *p, 3))
+			return ((p - months) + 1);
+	return (0);
+}
+
+
+int
+getday(char *s)
+{
+	char **p;
+	struct fixs *n;
+
+	for (n = fndays; n->name; ++n)
+		if (!strncasecmp(s, n->name, n->len))
+			return ((n - fndays) + 1);
+	for (n = ndays; n->name; ++n)
+		if (!strncasecmp(s, n->name, n->len))
+			return ((n - ndays) + 1);
+	for (p = days; *p; ++p)
+		if (!strncasecmp(s, *p, 3))
+			return ((p - days) + 1);
+	return (0);
+}
+
+/* return offset for variable weekdays
+ * -1 -> last weekday in month
+ * +1 -> first weekday in month
+ * ... etc ...
+ */
+int
+getdayvar(char *s)
+{
+	int offset;
+
+
+	offset = strlen(s);
+
+	/* Sun+1 or Wednesday-2
+	 *    ^              ^   */
+
+	/* printf ("x: %s %s %d\n", s, s + offset - 2, offset); */
+	switch(*(s + offset - 2)) {
+	case '-':
+	case '+':
+	    return(atoi(s + offset - 2));
+	    break;
+	}
+
+	/*
+	 * some aliases: last, first, second, third, fourth
+	 */
+
+	/* last */
+	if      (offset > 4 && !strcasecmp(s + offset - 4, "last"))
+	    return(-1);
+	else if (offset > 5 && !strcasecmp(s + offset - 5, "first"))
+	    return(+1);
+	else if (offset > 6 && !strcasecmp(s + offset - 6, "second"))
+	    return(+2);
+	else if (offset > 5 && !strcasecmp(s + offset - 5, "third"))
+	    return(+3);
+	else if (offset > 6 && !strcasecmp(s + offset - 6, "fourth"))
+	    return(+4);
+
+	/* no offset detected */
+	return(0);
+}
+
+
+int
+foy(int year)
+{
+	/* 0-6; what weekday Jan 1 is */
+	year--;
+	return ((1 - year/100 + year/400 + (int)(365.25 * year)) % 7);
+}
+
+
+
+void
+variable_weekday(int *day, int month, int year)
+{
+	int v1, v2;
+	int *cumdays;
+	int day1;
+
+	if (isleap(year))
+		cumdays = daytab[1];
+	else
+		cumdays = daytab[0];
+	day1 = foy(year);
+	/* negative offset; last, -4 .. -1 */
+	if (*day < 0) {
+		v1 = *day/10 - 1;          /* offset -4 ... -1 */
+		*day = 10 + (*day % 10);    /* day 1 ... 7 */
+
+		/* which weekday the end of the month is (1-7) */
+		v2 = (cumdays[month + 1] + day1) % 7 + 1;
+
+		/* and subtract enough days */
+		*day = cumdays[month + 1] - cumdays[month] +
+		    (v1 + 1) * 7 - (v2 - *day + 7) % 7;
+#if DEBUG
+		fprintf(stderr, "\nMonth %d ends on weekday %d\n", month, v2);
+#endif
+	}
+
+	/* first, second ... +1 ... +5 */
+	else {
+		v1 = *day/10;        /* offset */
+		*day = *day % 10;
+
+		/* which weekday the first of the month is (1-7) */
+		v2 = (cumdays[month] + 1 + day1) % 7 + 1;
+
+		/* and add enough days */
+		*day = 1 + (v1 - 1) * 7 + (*day - v2 + 7) % 7;
+#if DEBUG
+		fprintf(stderr, "\nMonth %d starts on weekday %d\n", month, v2);
+#endif
+	}
+}
diff --git a/src/usr.bin/calendar/io.c b/src/usr.bin/calendar/io.c
new file mode 100644
index 0000000..1d6ef58
--- /dev/null
+++ b/src/usr.bin/calendar/io.c
@@ -0,0 +1,455 @@
+/*	$OpenBSD: io.c,v 1.36 2013/11/26 13:18:53 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <locale.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <tzfile.h>
+#include <unistd.h>
+
+#include "pathnames.h"
+#include "calendar.h"
+
+
+struct iovec header[] = {
+	{ "From: ", 6 },
+	{ NULL, 0 },
+	{ " (Reminder Service)\nTo: ", 24 },
+	{ NULL, 0 },
+	{ "\nSubject: ", 10 },
+	{ NULL, 0 },
+	{ "'s Calendar\nPrecedence: bulk\n",  29 },
+	{ "Auto-Submitted: auto-generated\n\n", 32 },
+};
+
+
+void
+cal(void)
+{
+	int ch, l, i, bodun = 0, bodun_maybe = 0, var, printing;
+	struct event *events, *cur_evt, *ev1, *tmp;
+	char buf[2048 + 1], *prefix = NULL, *p;
+	struct match *m;
+	FILE *fp;
+
+	events = NULL;
+	cur_evt = NULL;
+	if ((fp = opencal()) == NULL)
+		return;
+	for (printing = 0; fgets(buf, sizeof(buf), stdin) != NULL;) {
+		if ((p = strchr(buf, '\n')) != NULL)
+			*p = '\0';
+		else
+			while ((ch = getchar()) != '\n' && ch != EOF);
+		for (l = strlen(buf); l > 0 && isspace(buf[l - 1]); l--)
+			;
+		buf[l] = '\0';
+		if (buf[0] == '\0')
+			continue;
+		if (strncmp(buf, "LANG=", 5) == 0) {
+			(void) setlocale(LC_ALL, buf + 5);
+			setnnames();
+			if (!strcmp(buf + 5, "ru_RU.KOI8-R") ||
+			    !strcmp(buf + 5, "uk_UA.KOI8-U") ||
+			    !strcmp(buf + 5, "by_BY.KOI8-B")) {
+				bodun_maybe++;
+				bodun = 0;
+				if (prefix)
+					free(prefix);
+				prefix = NULL;
+			} else
+				bodun_maybe = 0;
+			continue;
+		} else if (strncmp(buf, "CALENDAR=", 9) == 0) {
+			char *ep;
+
+			if (buf[9] == '\0')
+				calendar = 0;
+			else if (!strcasecmp(buf + 9, "julian")) {
+				calendar = JULIAN;
+				errno = 0;
+				julian = strtoul(buf + 14, &ep, 10);
+				if (buf[0] == '\0' || *ep != '\0')
+					julian = 13;
+				if ((errno == ERANGE && julian == ULONG_MAX) ||
+				    julian > 14)
+					errx(1, "Julian calendar offset is too large");
+			} else if (!strcasecmp(buf + 9, "gregorian"))
+				calendar = GREGORIAN;
+			else if (!strcasecmp(buf + 9, "lunar"))
+				calendar = LUNAR;
+		} else if (bodun_maybe && strncmp(buf, "BODUN=", 6) == 0) {
+			bodun++;
+			if (prefix)
+				free(prefix);
+			if ((prefix = strdup(buf + 6)) == NULL)
+				err(1, NULL);
+			continue;
+		}
+		/* User defined names for special events */
+		if ((p = strchr(buf, '='))) {
+			for (i = 0; i < NUMEV; i++) {
+				if (strncasecmp(buf, spev[i].name,
+				    spev[i].nlen) == 0 &&
+				    (p - buf == spev[i].nlen) &&
+				    buf[spev[i].nlen + 1]) {
+					p++;
+					if (spev[i].uname != NULL)
+						free(spev[i].uname);
+					if ((spev[i].uname = strdup(p)) == NULL)
+						err(1, NULL);
+					spev[i].ulen = strlen(p);
+					i = NUMEV + 1;
+				}
+			}
+			if (i > NUMEV)
+				continue;
+		}
+		if (buf[0] != '\t') {
+			printing = (m = isnow(buf, bodun)) ? 1 : 0;
+			if ((p = strchr(buf, '\t')) == NULL) {
+				printing = 0;
+				continue;
+			}
+			/* Need the following to catch hardwired "variable"
+			 * dates */
+			if (p > buf && p[-1] == '*')
+				var = 1;
+			else
+				var = 0;
+			if (printing) {
+				struct match *foo;
+				
+				ev1 = NULL;
+				while (m) {
+					cur_evt = malloc(sizeof(struct event));
+					if (cur_evt == NULL)
+						err(1, NULL);
+	
+					cur_evt->when = m->when;
+					snprintf(cur_evt->print_date,
+					    sizeof(cur_evt->print_date), "%s%c",
+					    m->print_date, (var + m->var) ? '*' : ' ');
+					if (ev1) {
+						cur_evt->desc = ev1->desc;
+						cur_evt->ldesc = NULL;
+					} else {
+						if (m->bodun && prefix) {
+							if (asprintf(&cur_evt->ldesc,
+							    "\t%s %s", prefix,
+							    p + 1) == -1)
+								err(1, NULL);
+						} else if ((cur_evt->ldesc =
+						    strdup(p)) == NULL)
+							err(1, NULL);
+						cur_evt->desc = &(cur_evt->ldesc);
+						ev1 = cur_evt;
+					}
+					insert(&events, cur_evt);
+					foo = m;
+					m = m->next;
+					free(foo);
+				}
+			}
+		} else if (printing) {
+			if (asprintf(&p, "%s\n%s", ev1->ldesc,
+			    buf) == -1)
+				err(1, NULL);
+			free(ev1->ldesc);
+			ev1->ldesc = p;
+		}
+	}
+	tmp = events;
+	while (tmp) {
+		(void)fprintf(fp, "%s%s\n", tmp->print_date, *(tmp->desc));
+		tmp = tmp->next;
+	}
+	tmp = events;
+	while (tmp) {
+		events = tmp;
+		if (tmp->ldesc)
+			free(tmp->ldesc);
+		tmp = tmp->next;
+		free(events);
+	}
+	closecal(fp);
+}
+
+int
+getfield(char *p, char **endp, int *flags)
+{
+	int val, var, i;
+	char *start, savech;
+
+	for (; !isdigit((unsigned char)*p) && !isalpha((unsigned char)*p) &&
+	    *p != '*' && *p != '\t'; ++p)
+		;
+	if (*p == '*') {			/* `*' is every month */
+		*flags |= F_ISMONTH;
+		*endp = p+1;
+		return (-1);	/* means 'every month' */
+	}
+	if (isdigit((unsigned char)*p)) {
+		val = strtol(p, &p, 10);	/* if 0, it's failure */
+		for (; !isdigit((unsigned char)*p) &&
+		    !isalpha((unsigned char)*p) && *p != '*'; ++p)
+			;
+		*endp = p;
+		return (val);
+	}
+	for (start = p; isalpha((unsigned char)*++p);)
+		;
+
+	/* Sunday-1 */
+	if (*p == '+' || *p == '-')
+		for(; isdigit((unsigned char)*++p); )
+			;
+
+	savech = *p;
+	*p = '\0';
+
+	/* Month */
+	if ((val = getmonth(start)) != 0)
+		*flags |= F_ISMONTH;
+
+	/* Day */
+	else if ((val = getday(start)) != 0) {
+		*flags |= F_ISDAY;
+
+		/* variable weekday */
+		if ((var = getdayvar(start)) != 0) {
+			if (var <= 5 && var >= -4)
+				val += var * 10;
+#ifdef DEBUG
+			printf("var: %d\n", var);
+#endif
+		}
+	}
+
+	/* Try specials (Easter, Paskha, ...) */
+	else {
+		for (i = 0; i < NUMEV; i++) {
+			if (strncasecmp(start, spev[i].name, spev[i].nlen) == 0) {
+				start += spev[i].nlen;
+				val = i + 1;
+				i = NUMEV + 1;
+			} else if (spev[i].uname != NULL &&
+			    strncasecmp(start, spev[i].uname, spev[i].ulen) == 0) {
+				start += spev[i].ulen;
+				val = i + 1;
+				i = NUMEV + 1;
+			}
+		}
+		if (i > NUMEV) {
+			switch(*start) {
+			case '-':
+			case '+':
+				var = atoi(start);
+				if (var > 365 || var < -365)
+					return (0); /* Someone is just being silly */
+				val += (NUMEV + 1) * var;
+				/* We add one to the matching event and multiply by
+				 * (NUMEV + 1) so as not to return 0 if there's a match.
+				 * val will overflow if there is an obscenely large
+				 * number of special events. */
+				break;
+			}
+			*flags |= F_SPECIAL;	
+		}
+		if (!(*flags & F_SPECIAL)) {
+			/* undefined rest */
+			*p = savech;
+			return (0);
+		}
+	}
+	for (*p = savech; !isdigit((unsigned char)*p) &&
+	    !isalpha((unsigned char)*p) && *p != '*' && *p != '\t'; ++p)
+		;
+	*endp = p;
+	return (val);
+}
+
+
+FILE *
+opencal(void)
+{
+	int pdes[2], fdin;
+	struct stat st;
+
+	/* open up calendar file as stdin */
+	if ((fdin = open(calendarFile, O_RDONLY)) == -1 ||
+	    fstat(fdin, &st) == -1 || !S_ISREG(st.st_mode)) {
+		if (!doall) {
+			char *home = getenv("HOME");
+			if (home == NULL || *home == '\0')
+				errx(1, "cannot get home directory");
+			if (!(chdir(home) == 0 &&
+			    chdir(calendarHome) == 0 &&
+			    (fdin = open(calendarFile, O_RDONLY)) != -1))
+				errx(1, "no calendar file: ``%s'' or ``~/%s/%s''",
+				    calendarFile, calendarHome, calendarFile);
+		}
+	}
+
+	if (pipe(pdes) < 0)
+		return (NULL);
+	switch (vfork()) {
+	case -1:			/* error */
+		(void)close(pdes[0]);
+		(void)close(pdes[1]);
+		return (NULL);
+	case 0:
+		dup2(fdin, STDIN_FILENO);
+		/* child -- set stdout to pipe input */
+		if (pdes[1] != STDOUT_FILENO) {
+			(void)dup2(pdes[1], STDOUT_FILENO);
+			(void)close(pdes[1]);
+		}
+		(void)close(pdes[0]);
+		/* 
+		 * Set stderr to /dev/null.  Necessary so that cron does not
+		 * wait for cpp to finish if it's running calendar -a.
+		 */
+		if (doall) {
+			int fderr;
+			fderr = open(_PATH_DEVNULL, O_WRONLY, 0);
+			if (fderr == -1)
+				_exit(0);
+			(void)dup2(fderr, STDERR_FILENO);
+			(void)close(fderr);
+		}
+		execl(_PATH_CPP, "cpp", "-traditional", "-undef", "-U__GNUC__",
+		    "-P", "-I.", _PATH_INCLUDE, (char *)NULL);
+		warn(_PATH_CPP);
+		_exit(1);
+	}
+	/* parent -- set stdin to pipe output */
+	(void)dup2(pdes[0], STDIN_FILENO);
+	(void)close(pdes[0]);
+	(void)close(pdes[1]);
+
+	/* not reading all calendar files, just set output to stdout */
+	if (!doall)
+		return (stdout);
+
+	/* set output to a temporary file, so if no output don't send mail */
+	return(tmpfile());
+}
+
+void
+closecal(FILE *fp)
+{
+	struct stat sbuf;
+	int nread, pdes[2], status;
+	char buf[1024];
+
+	if (!doall)
+		return;
+
+	(void)rewind(fp);
+	if (fstat(fileno(fp), &sbuf) || !sbuf.st_size)
+		goto done;
+	if (pipe(pdes) < 0)
+		goto done;
+	switch (vfork()) {
+	case -1:			/* error */
+		(void)close(pdes[0]);
+		(void)close(pdes[1]);
+		goto done;
+	case 0:
+		/* child -- set stdin to pipe output */
+		if (pdes[0] != STDIN_FILENO) {
+			(void)dup2(pdes[0], STDIN_FILENO);
+			(void)close(pdes[0]);
+		}
+		(void)close(pdes[1]);
+		execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F",
+		    "\"Reminder Service\"", (char *)NULL);
+		warn(_PATH_SENDMAIL);
+		_exit(1);
+	}
+	/* parent -- write to pipe input */
+	(void)close(pdes[0]);
+
+	header[1].iov_base = header[3].iov_base = pw->pw_name;
+	header[1].iov_len = header[3].iov_len = strlen(pw->pw_name);
+	writev(pdes[1], header, 8);
+	while ((nread = read(fileno(fp), buf, sizeof(buf))) > 0)
+		(void)write(pdes[1], buf, nread);
+	(void)close(pdes[1]);
+done:	(void)fclose(fp);
+	while (wait(&status) >= 0)
+		;
+}
+
+
+void
+insert(struct event **head, struct event *cur_evt)
+{
+	struct event *tmp, *tmp2;
+
+	if (*head) {
+		/* Insert this one in order */
+		tmp = *head;
+		tmp2 = NULL;
+		while (tmp->next &&
+		    tmp->when <= cur_evt->when) {
+			tmp2 = tmp;
+			tmp = tmp->next;
+		}
+		if (tmp->when > cur_evt->when) {
+			cur_evt->next = tmp;
+			if (tmp2)
+				tmp2->next = cur_evt;
+			else
+				*head = cur_evt;
+		} else {
+			cur_evt->next = tmp->next;
+			tmp->next = cur_evt;
+		}
+	} else {
+		*head = cur_evt;
+		cur_evt->next = NULL;
+	}
+}
diff --git a/src/usr.bin/calendar/ostern.c b/src/usr.bin/calendar/ostern.c
new file mode 100644
index 0000000..c86c577
--- /dev/null
+++ b/src/usr.bin/calendar/ostern.c
@@ -0,0 +1,77 @@
+/*	$OpenBSD: ostern.c,v 1.7 2009/10/27 23:59:36 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * 	$Id: ostern.c,v 1.7 2009/10/27 23:59:36 deraadt Exp $
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <tzfile.h>
+
+#include "calendar.h"
+
+/* return year day for Easter */
+
+int
+easter(int year)	/* 0 ... abcd, NOT since 1900 */
+{
+	int	e_a, e_b, e_c, e_d, e_e,e_f, e_g, e_h, e_i, e_k;
+	int	e_l, e_m, e_n, e_p, e_q;
+
+	/* silly, but it works */
+	e_a = year % 19;
+	e_b = year / 100;
+	e_c = year % 100;
+
+	e_d = e_b / 4;
+	e_e = e_b % 4;
+	e_f = (e_b + 8) / 25;
+	e_g = (e_b + 1 - e_f) / 3;
+	e_h = ((19 * e_a) + 15 + e_b - (e_d + e_g)) % 30;
+	e_i = e_c / 4;
+	e_k = e_c % 4;
+	e_l = (32 + 2 * e_e + 2 * e_i - (e_h + e_k)) % 7;
+	e_m = (e_a + 11 * e_h + 22 * e_l) / 451;
+	e_n = (e_h + e_l + 114 - (7 * e_m)) / 31;
+	e_p = (e_h + e_l + 114 - (7 * e_m)) % 31;
+	e_p = e_p + 1;
+
+	e_q = 31 + 28 + e_p;
+	if (isleap(year))
+		e_q++;
+
+	if (e_n == 4)
+	e_q += 31;
+
+#if DEBUG
+	printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
+	    e_a, e_b, e_c, e_d, e_e, e_f, e_g, e_h,
+	    e_i, e_k, e_l, e_m, e_n, e_p, e_q);
+#endif
+
+	return (e_q);
+}
diff --git a/src/usr.bin/calendar/paskha.c b/src/usr.bin/calendar/paskha.c
new file mode 100644
index 0000000..fb958cd
--- /dev/null
+++ b/src/usr.bin/calendar/paskha.c
@@ -0,0 +1,54 @@
+/*	$OpenBSD: paskha.c,v 1.6 2009/10/27 23:59:36 deraadt Exp $	*/
+
+/*
+ * Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <tzfile.h>
+
+#include "calendar.h"
+
+/* return year day for Orthodox Easter using Gauss formula */
+/* (new style result); subtract 13 for old style */
+
+int
+paskha(int R)  /*year*/
+{
+	int a, b, c, d, e;
+	static int x = 15;
+	static int y = 6;
+	int cumdays;
+
+	a = R % 19;
+	b = R % 4;
+	c = R % 7;
+	d = (19*a + x) % 30;
+	e = (2*b + 4*c + 6*d + y) % 7;
+	cumdays = 31 + 28;
+	if (isleap(R))
+		cumdays++;
+	return ((cumdays + 22) + (d + e) + 13);
+}
diff --git a/src/usr.bin/calendar/pathnames.h b/src/usr.bin/calendar/pathnames.h
new file mode 100644
index 0000000..534b7f9
--- /dev/null
+++ b/src/usr.bin/calendar/pathnames.h
@@ -0,0 +1,39 @@
+/*	$OpenBSD: pathnames.h,v 1.5 2014/07/30 16:46:17 jsg Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
+ */
+
+#include <paths.h>
+
+#define	_PATH_CPP	"/usr/libexec/tradcpp"
+
+			/* XXX -- fix when cpp parses arguments rationally */
+#define	_PATH_INCLUDE	"-I/usr/share/calendar"
diff --git a/src/usr.bin/calendar/pesach.c b/src/usr.bin/calendar/pesach.c
new file mode 100644
index 0000000..70bbff2
--- /dev/null
+++ b/src/usr.bin/calendar/pesach.c
@@ -0,0 +1,66 @@
+/*	$OpenBSD: pesach.c,v 1.3 2009/10/27 23:59:36 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 2004 Michael Shalayeff
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <tzfile.h>
+
+#include "calendar.h"
+
+/* Calculate the Julian date of Pesach using the Gauss formula */
+
+#define	T	(33. + 14. / 24.)
+#define	L	((1.  + 485. / 1080.) / 24. / 19.)
+#define	K	((29. + (12. + 793. / 1080.) / 24. ) / 19.)
+
+int
+pesach(int R)
+{
+	int a, b, y, cumdays;
+	double d;
+
+	y = R + 3760;
+
+	a = (12 * y + 17) % 19;
+	b = y % 4;
+	d = (T - 10 * K + L + 14) + K * a +  b / 4. - L * y;
+	cumdays = d;
+
+	/* the postponement */
+	switch ((int)(cumdays + 3 * y + 5 * b + 5) % 7) {
+	case 1:
+		if (a > 6 && d - cumdays >= (15. + 204. / 1080.) / 24.)
+			cumdays += 2;
+		break;
+
+	case 0:
+		if (a <= 11 || d - cumdays < (21. + 589. / 1080.) / 24.)
+			break;
+		/* FALLTHROUGH */
+	case 2:
+	case 4:
+	case 6:
+		cumdays++;
+		break;
+	}
+
+	if (R > 1582)
+		cumdays += R / 100 - R /400 - 2;
+
+	return (31 + 28 + cumdays + (isleap(R)? 1 : 0));
+}