4 files changed, 56 insertions, 10 deletions
diff --git a/src/usr.bin/calendar/calendars/calendar.all b/src/usr.bin/calendar/calendars/calendar.all
index 172357d..9e759bf 100644
--- a/src/usr.bin/calendar/calendars/calendar.all
+++ b/src/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $OpenBSD: calendar.all,v 1.5 2013/03/15 08:37:10 jmc Exp $
+ * $OpenBSD: calendar.all,v 1.7 2016/01/20 19:12:28 jmc Exp $
  */
 
 #ifndef _calendar_all_
@@ -17,5 +17,7 @@
 #include <calendar.ushistory>
 #include <calendar.space>
 #include <calendar.canada>
+#include <calendar.uk>
+#include <calendar.nz>
 
 #endif /* !_calendar_all_ */
diff --git a/src/usr.bin/calendar/calendars/calendar.holiday b/src/usr.bin/calendar/calendars/calendar.holiday
index ca9e5e0..4f87ead 100644
--- a/src/usr.bin/calendar/calendars/calendar.holiday
+++ b/src/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $OpenBSD: calendar.holiday,v 1.32 2015/10/12 06:33:21 jmc Exp $
+ * $OpenBSD: calendar.holiday,v 1.35 2016/01/20 19:12:28 jmc Exp $
  */
 
 #ifndef _calendar_holiday_
@@ -12,7 +12,6 @@
 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
@@ -45,7 +44,6 @@
 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
@@ -138,7 +136,7 @@
 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*	ANZAC Day in Australia, New Zealand, and various other influenced places
 04/25	Liberation Day in Italy
 04/25	National Flag Day in Swaziland
 04/26	Confederate Memorial Day in Florida & Georgia
@@ -285,7 +283,6 @@
 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
@@ -393,7 +390,6 @@
 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
@@ -435,7 +431,7 @@
 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
+11/30	Saint Andrew's Day (also a bank holiday in Scotland)
 12/01	Independence Day in Central African Republic
 12/01	World AIDS Day
 12/01	National Day in Romania
@@ -490,7 +486,6 @@
 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
diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music
index 68bb1a7..d4bd30a 100644
--- a/src/usr.bin/calendar/calendars/calendar.music
+++ b/src/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $OpenBSD: calendar.music,v 1.32 2015/05/21 10:42:30 jmc Exp $
+ * $OpenBSD: calendar.music,v 1.33 2016/01/11 07:46:37 sthen Exp $
  */
 
 #ifndef _calendar_music_
@@ -23,6 +23,7 @@
 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	David Bowie dies, 2016
 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
diff --git a/src/usr.bin/calendar/calendars/calendar.nz b/src/usr.bin/calendar/calendars/calendar.nz
new file mode 100644
index 0000000..619b980
--- /dev/null
+++ b/src/usr.bin/calendar/calendars/calendar.nz
@@ -0,0 +1,48 @@
+/*
+ * New Zealand holiday
+ *
+ * $OpenBSD: calendar.nz,v 1.1 2016/01/20 19:12:28 jmc Exp $
+ */
+
+#ifndef _calendar_nz_
+#define _calendar_nz_
+
+01/01	New Year's Day
+01/02	Day after New Year's Day (public holiday)
+02/06*	New Zealand/Waitangi Day (public holiday)
+02/14	Saint Valentine's Day
+04/01	April Fools' Day
+04/SunFirst	Daylight Saving Time ends; clocks move back (first Sunday of April)
+05/SunSecond	Mother's Day (2nd Sunday in May)
+06/MonFirst	Queen's Birthday (public holiday, ski season begins)
+09/SunFirst	Father's Day (1st Sunday of September)
+09/26	Dominion Day
+09/SunLast	Daylight Saving Time starts; clocks move forward (last Sunday in September)
+10/MonFourth	Labour Day (public holiday)
+10/31	Halloween
+11/05	Guy Fawkes' Night
+12/25	Christmas Day
+12/26	Boxing Day
+12/31	New Year's Eve
+
+/* Provincial anniversary days */
+01/22*	Wellington Anniversary Day
+01/29*	Auckland and Northland Anniversary Days
+02/01*	Nelson Anniversary Day
+03/23*	Otago Anniversary Day
+03/MonSecond	New Plymouth Anniversary Day
+Easter+2	Southland Anniversary Day
+09/MonFourth	South Canterbury Anniversary Day
+09/FriThird	Hawke's Bay Anniversary Day
+11/01*	Marlborough Anniversary Day
+11/30*	Chatham Islands Anniversary Day
+12/01*	Westland Anniversary Day
+12/16*	South Canterbury Anniversary Day
+
+/* Seasonal days */
+03/20*	Autumnal Equinox
+06/21*	Winter Solstice
+09/22*	Vernal Equinox
+12/21*	Summer Solstice
+
+#endif /* !_calendar_nz_ */