diff --git a/doc/rc/holidays.be-BY.rc b/doc/rc/holidays.be-BY.rc
index f3593b9f1..8d92fd0c8 100644
--- a/doc/rc/holidays.be-BY.rc
+++ b/doc/rc/holidays.be-BY.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Belarus
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/be-BY/2012.json
+# http://holidata.net/be-BY/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,54 +25,45 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.newyearsday.name=Новы Год
-holiday.newyearsday.date=20110101
-holiday.ortodoxcristmasday.name=Раство Хрыстова(праваслаўнае)
-holiday.ortodoxcristmasday.date=20110107
-holiday.independenceday.name=Дзень незалежнаці
-holiday.independenceday.date=20110703
-holiday.womensday.name=Міжнародны жаночы дзень
-holiday.womensday.date=20110308
-holiday.eastern.name=Пасха
-holiday.eastern.date=20110424
-holiday.labourday.name=Свята працы
-holiday.labourday.date=20110501
-holiday.radunica.name=Радуніца
-holiday.radunica.date=20110503
-holiday.winday.name=Дзень Перамогі
-holiday.winday.date=20110509
-holiday.independence.name=Дзень Незалежнасці
-holiday.independence.date=20110703
-holiday.octoberrevolution.name=Дзень Кастрычніцкай рэвалюцыі
-holiday.octoberrevolution.date=20111107
-holiday.westchristmasday.name=Раство Хрыстова(у заходніх хрысціян)
-holiday.westchristmasday.date=20111225
-
-# 2012
-#holiday.newyearsday.name=Новы Год
-#holiday.newyearsday.date=20120101
-#holiday.ortodoxcristmasday.name=Раство Хрыстова(праваслаўнае)
-#holiday.ortodoxcristmasday.date=20120107
-#holiday.independenceday.name=Дзень незалежнаці
-#holiday.independenceday.date=20120703
-#holiday.womensday.name=Міжнародны жаночы дзень
-#holiday.womensday.date=20120308
-#holiday.eastern.name=Пасха
-#holiday.eastern.date=20120415
-#holiday.radunica.name=Радуніца
-#holiday.radunica.date=20120424
-#holiday.labourday.name=Свята працы
-#holiday.labourday.date=20120501
-#holiday.winday.name=Дзень Перамогі
-#holiday.winday.date=20120509
-#holiday.independence.name=Дзень Незалежнасці
-#holiday.independence.date=20120703
-#holiday.octoberrevolution.name=Дзень Кастрычніцкай рэвалюцыі
-#holiday.octoberrevolution.date=20121107
-#holiday.westchristmasday.name=Раство Хрыстова(у заходніх хрысціян)
-#holiday.westchristmasday.date=20121225
+holiday.be-BY1.name=Новы Год
+holiday.be-BY1.date=2012-01-01
+holiday.be-BY2.name=Раство Хрыстова(праваслаўнае)
+holiday.be-BY2.date=2012-01-07
+holiday.be-BY3.name=Міжнародны жаночы дзень
+holiday.be-BY3.date=2012-08-03
+holiday.be-BY4.name=Пасха(праваслаўная)
+holiday.be-BY4.date=2012-04-15
+holiday.be-BY5.name=Радуніца
+holiday.be-BY5.date=2012-04-24
+holiday.be-BY6.name=Свята працы
+holiday.be-BY6.date=2012-05-01
+holiday.be-BY7.name=Дзень Перамогі
+holiday.be-BY7.date=2012-05-09
+holiday.be-BY8.name=Дзень незалежнаці
+holiday.be-BY8.date=2012-07-03
+holiday.be-BY9.name=Дзень Кастрычніцкай рэвалюцыі
+holiday.be-BY9.date=2012-11-07
+holiday.be-BY10.name=Раство Хрыстова(у заходніх хрысціян)
+holiday.be-BY10.date=2012-12-25
+holiday.be-BY11.name=Новы Год
+holiday.be-BY11.date=2013-01-01
+holiday.be-BY12.name=Раство Хрыстова(праваслаўнае)
+holiday.be-BY12.date=2013-01-07
+holiday.be-BY13.name=Міжнародны жаночы дзень
+holiday.be-BY13.date=2013-08-03
+holiday.be-BY14.name=Пасха(праваслаўная)
+holiday.be-BY14.date=2013-05-05
+holiday.be-BY15.name=Радуніца
+holiday.be-BY15.date=2013-05-14
+holiday.be-BY16.name=Свята працы
+holiday.be-BY16.date=2013-05-01
+holiday.be-BY17.name=Дзень Перамогі
+holiday.be-BY17.date=2013-05-09
+holiday.be-BY18.name=Дзень незалежнаці
+holiday.be-BY18.date=2013-07-03
+holiday.be-BY19.name=Дзень Кастрычніцкай рэвалюцыі
+holiday.be-BY19.date=2013-11-07
+holiday.be-BY20.name=Раство Хрыстова(у заходніх хрысціян)
+holiday.be-BY20.date=2013-12-25
diff --git a/doc/rc/holidays.cs-CZ.rc b/doc/rc/holidays.cs-CZ.rc
index 7e0365be2..a3e1f7518 100644
--- a/doc/rc/holidays.cs-CZ.rc
+++ b/doc/rc/holidays.cs-CZ.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for the UK
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/cs-CZ/2012.json
+# http://holidata.net/cs-CZ/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,45 +25,57 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.newyear.name=Nový rok, Den obnovy samostatnosti českého státu
-holiday.newyear.date=20110101
-
-# this one differs for each year
-holiday.eastermonday.name=Velikonoční pondělí
-holiday.eastermonday.date=20110425
-
-holiday.mayday.name=Svátek práce
-holiday.mayday.date=20110501
-
-holiday.victoryday.name=Den vítězství
-holiday.victoryday.date=20110508
-
-holiday.cyrilmetodej.name=Den slovanských věrozvěstů
-holiday.cyrilmetodej.date=20110705
-
-holiday.husburntodeath.name=Den upálení mistra Jana Husa
-holiday.husburntodeath.date=20110706
-
-holiday.statehoodday.name=Den české státnosti
-holiday.statehoodday.date=20110928
-
-holiday.independentcs.name=Den vzniku samostatného československého státu
-holiday.independentcs.date=20111028
-
-holiday.democracyfight.name=Den boje za svobodu a demokracii
-holiday.democracyfight.date=20111117
-
-holiday.christmaseve.name=Štědrý den
-holiday.christmaseve.date=20111224
-
-holiday.christmasdayone.name=1. svátek vánoční
-holiday.christmasdayone.date=20111225
-
-holiday.christmasdaytwo.name=2. svátek vánoční
-holiday.christmasdaytwo.date=20111226
+###############################################################################
 
+holiday.cs-CZ1.name=Nový rok
+holiday.cs-CZ1.date=2012-01-01
+holiday.cs-CZ2.name=Den obnovy samostatnosti českého státu
+holiday.cs-CZ2.date=2012-01-01
+holiday.cs-CZ3.name=Velikonoční pondělí
+holiday.cs-CZ3.date=2012-04-09
+holiday.cs-CZ4.name=Svátek práce
+holiday.cs-CZ4.date=2012-05-01
+holiday.cs-CZ5.name=Den vítězství
+holiday.cs-CZ5.date=2012-05-08
+holiday.cs-CZ6.name=Den slovanských věrozvěstů
+holiday.cs-CZ6.date=2012-07-05
+holiday.cs-CZ7.name=Den upálení mistra Jana Husa
+holiday.cs-CZ7.date=2012-07-06
+holiday.cs-CZ8.name=Den české státnosti
+holiday.cs-CZ8.date=2012-09-28
+holiday.cs-CZ9.name=Den vzniku samostatného československého státu
+holiday.cs-CZ9.date=2012-10-28
+holiday.cs-CZ10.name=Den boje za svobodu a demokracii
+holiday.cs-CZ10.date=2012-11-17
+holiday.cs-CZ11.name=Štědrý den
+holiday.cs-CZ11.date=2012-12-24
+holiday.cs-CZ12.name=1. svátek vánoční
+holiday.cs-CZ12.date=2012-12-25
+holiday.cs-CZ13.name=2. svátek vánoční
+holiday.cs-CZ13.date=2012-12-26
+holiday.cs-CZ14.name=Nový rok
+holiday.cs-CZ14.date=2013-01-01
+holiday.cs-CZ15.name=Den obnovy samostatnosti českého státu
+holiday.cs-CZ15.date=2013-01-01
+holiday.cs-CZ16.name=Velikonoční pondělí
+holiday.cs-CZ16.date=2013-04-01
+holiday.cs-CZ17.name=Svátek práce
+holiday.cs-CZ17.date=2013-05-01
+holiday.cs-CZ18.name=Den vítězství
+holiday.cs-CZ18.date=2013-05-08
+holiday.cs-CZ19.name=Den slovanských věrozvěstů
+holiday.cs-CZ19.date=2013-07-05
+holiday.cs-CZ20.name=Den upálení mistra Jana Husa
+holiday.cs-CZ20.date=2013-07-06
+holiday.cs-CZ21.name=Den české státnosti
+holiday.cs-CZ21.date=2013-09-28
+holiday.cs-CZ22.name=Den vzniku samostatného československého státu
+holiday.cs-CZ22.date=2013-10-28
+holiday.cs-CZ23.name=Den boje za svobodu a demokracii
+holiday.cs-CZ23.date=2013-11-17
+holiday.cs-CZ24.name=Štědrý den
+holiday.cs-CZ24.date=2013-12-24
+holiday.cs-CZ25.name=1. svátek vánoční
+holiday.cs-CZ25.date=2013-12-25
+holiday.cs-CZ26.name=2. svátek vánoční
+holiday.cs-CZ26.date=2013-12-26
diff --git a/doc/rc/holidays.da-DK.rc b/doc/rc/holidays.da-DK.rc
index 5210d1133..800e7212e 100644
--- a/doc/rc/holidays.da-DK.rc
+++ b/doc/rc/holidays.da-DK.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Denmark
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/da-DK/2012.json
+# http://holidata.net/da-DK/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,58 +25,53 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.nytårsdag.name=Nytårsdag
-holiday.nytårsdag.date=20110101
-holiday.palmesøndag.name=Palmesøndag
-holiday.palmesøndag.date=20110417
-holiday.skærtorsdag.name=Skærtorsdag
-holiday.skærtorsdag.date=20110421
-holiday.langfredag.name=Langfredag
-holiday.langfredag.date=20110422
-holiday.påskedag.name=Påskedag
-holiday.påskedag.date=20110424
-holiday.andenpåskedag.name=Anden påskedag
-holiday.andenpåskedag.date=20110425
-holiday.storebededag.name=Store bededag
-holiday.storebededag.date=20110520
-holiday.kristihimmelfartsdag.name=Kristi himmelfartsdag
-holiday.kristihimmelfartsdag.date=20110602
-holiday.pinsedag.name=Pinsedag
-holiday.pinsedag.date=20110612
-holiday.andenpinsedag.name=Anden pinsedag
-holiday.andenpinsedag.date=20110613
-holiday.juledag.name=Juledag
-holiday.juledag.date=20111225
-holiday.andenjuledag.name=Anden juledag
-holiday.andenjuledag.date=20111226
-
-# 2012
-#holiday.nytårsdag.name=Nytårsdag
-#holiday.nytårsdag.date=20120101
-#holiday.palmesøndag.name=Palmesøndag
-#holiday.palmesøndag.date=20120401
-#holiday.skærtorsdag.name=Skærtorsdag
-#holiday.skærtorsdag.date=20120405
-#holiday.langfredag.name=Langfredag
-#holiday.langfredag.date=20120406
-#holiday.påskedag.name=Påskedag
-#holiday.påskedag.date=20120408
-#holiday.andenpåskedag.name=Anden påskedag
-#holiday.andenpåskedag.date=20120409
-#holiday.storebededag.name=Store bededag
-#holiday.storebededag.date=20120504
-#holiday.kristihimmelfartsdag.name=Kristi himmelfartsdag
-#holiday.kristihimmelfartsdag.date=20120517
-#holiday.pinsedag.name=Pinsedag
-#holiday.pinsedag.date=20120527
-#holiday.andenpinsedag.name=Anden pinsedag
-#holiday.andenpinsedag.date=20120528
-#holiday.juledag.name=Juledag
-#holiday.juledag.date=20121225
-#holiday.andenjuledag.name=Anden juledag
-#holiday.andenjuledag.date=20121226
+holiday.da-DK1.name=Nytårsdag
+holiday.da-DK1.date=2012-01-01
+holiday.da-DK2.name=Palmesøndag
+holiday.da-DK2.date=2012-04-01
+holiday.da-DK3.name=Skærtorsdag
+holiday.da-DK3.date=2012-04-05
+holiday.da-DK4.name=Langfredag
+holiday.da-DK4.date=2012-04-06
+holiday.da-DK5.name=Påskedag
+holiday.da-DK5.date=2012-04-08
+holiday.da-DK6.name=Anden påskedag
+holiday.da-DK6.date=2012-04-09
+holiday.da-DK7.name=Store bededag
+holiday.da-DK7.date=2012-05-04
+holiday.da-DK8.name=Kristi himmelfartsdag
+holiday.da-DK8.date=2012-05-17
+holiday.da-DK9.name=Pinsedag
+holiday.da-DK9.date=2012-05-27
+holiday.da-DK10.name=Anden pinsedag
+holiday.da-DK10.date=2012-05-28
+holiday.da-DK11.name=Juledag
+holiday.da-DK11.date=2012-12-25
+holiday.da-DK12.name=Anden juledag
+holiday.da-DK12.date=2012-12-26
+holiday.da-DK13.name=Nytårsdag
+holiday.da-DK13.date=2013-01-01
+holiday.da-DK14.name=Palmesøndag
+holiday.da-DK14.date=2013-03-24
+holiday.da-DK15.name=Skærtorsdag
+holiday.da-DK15.date=2013-03-28
+holiday.da-DK16.name=Langfredag
+holiday.da-DK16.date=2013-03-29
+holiday.da-DK17.name=Påskedag
+holiday.da-DK17.date=2013-03-31
+holiday.da-DK18.name=Anden påskedag
+holiday.da-DK18.date=2013-04-01
+holiday.da-DK19.name=Store bededag
+holiday.da-DK19.date=2013-04-26
+holiday.da-DK20.name=Kristi himmelfartsdag
+holiday.da-DK20.date=2013-05-09
+holiday.da-DK21.name=Pinsedag
+holiday.da-DK21.date=2013-05-19
+holiday.da-DK22.name=Anden pinsedag
+holiday.da-DK22.date=2013-05-20
+holiday.da-DK23.name=Juledag
+holiday.da-DK23.date=2013-12-25
+holiday.da-DK24.name=Anden juledag
+holiday.da-DK24.date=2013-12-26
diff --git a/doc/rc/holidays.de-AT.rc b/doc/rc/holidays.de-AT.rc
index dddf32d09..e0365aed3 100644
--- a/doc/rc/holidays.de-AT.rc
+++ b/doc/rc/holidays.de-AT.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Austria
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/de-AT/2012.json
+# http://holidata.net/de-AT/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,54 +25,97 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.neujahr.name=Neujahr
-holiday.neujahr.date=20110101
-holiday.heiligedreikonige.name=Heilige drei Könige
-holiday.heiligedreikonige.date=20110106
-holiday.josef.name=Josef (K, St, T, V)
-holiday.josef.date=20110319
-holiday.karfreitag.name=Karfreitag
-holiday.karfreitag.date=20110422
-holiday.ostersonntag.name=Ostersonntag
-holiday.ostersonntag.date=20110424
-holiday.ostermontag.name=Ostermontag
-holiday.ostermontag.date=20110425
-holiday.staatsfeiertag.name=Staatsfeiertag
-holiday.staatsfeiertag.date=20110501
-holiday.florian.name=Florian (OÖ)
-holiday.florian.date=20110504
-holiday.christihimmelfahrt.name=Christi Himmelfahrt
-holiday.christihimmelfahrt.date=20110602
-holiday.pfingstsonntag.name=Pfingstsonntag
-holiday.pfingstsonntag.date=20110612
-holiday.pfingstmontag.name=Pfingstmontag
-holiday.pfingstmontag.date=20110613
-holiday.fronleichnam.name=Fronleichnam
-holiday.fronleichnam.date=20110623
-holiday.mariahimmelfahrt.name=MariÀ Himmelfahrt
-holiday.mariahimmelfahrt.date=20110815
-holiday.rupert.name=Rupert (S)
-holiday.rupert.date=20110924
-holiday.kvolksabst.name=Tag der Volksabstimmung (K)
-holiday.kvolksabst.date=20111010
-holiday.allerheiligen.name=Allerheiligen
-holiday.allerheiligen.date=20111101
-holiday.martin.name=Martin (B)
-holiday.martin.date=20111111
-holiday.leopold.name=Leopold (W, NÖ)
-holiday.leopold.date=20111115
-holiday.mariaempfaengnis.name=MariÀ EmpfÀngnis
-holiday.mariaempfaengnis.date=20111208
-holiday.heiligerabend.name=Heiliger Abend
-holiday.heiligerabend.date=20111224
-holiday.christtag.name=Christtag
-holiday.christtag.date=20111225
-holiday.stefanitag.name=Stefanitag
-holiday.stefanitag.date=20111226
-holiday.silvester.name=Silvester
-holiday.silvester.date=20111231
+holiday.de-AT1.name=Neujahr
+holiday.de-AT1.date=2012-01-01
+holiday.de-AT2.name=Heilige drei Könige
+holiday.de-AT2.date=2012-01-06
+holiday.de-AT3.name=Josef (K, St, T, V)
+holiday.de-AT3.date=2012-03-19
+holiday.de-AT4.name=Karfreitag
+holiday.de-AT4.date=2012-04-06
+holiday.de-AT5.name=Ostersonntag
+holiday.de-AT5.date=2012-04-08
+holiday.de-AT6.name=Ostermontag
+holiday.de-AT6.date=2012-04-09
+holiday.de-AT7.name=Staatsfeiertag
+holiday.de-AT7.date=2012-05-01
+holiday.de-AT8.name=Florian (O)
+holiday.de-AT8.date=2012-05-04
+holiday.de-AT9.name=Christi Himmelfahrt
+holiday.de-AT9.date=2012-05-17
+holiday.de-AT10.name=Pfingstsonntag
+holiday.de-AT10.date=2012-05-27
+holiday.de-AT11.name=Pfingstmontag
+holiday.de-AT11.date=2012-05-28
+holiday.de-AT12.name=Fronleichnam
+holiday.de-AT12.date=2012-06-07
+holiday.de-AT13.name=Mariä Himmelfahrt
+holiday.de-AT13.date=2012-08-15
+holiday.de-AT14.name=Rupert (S)
+holiday.de-AT14.date=2012-09-24
+holiday.de-AT15.name=Tag der Volksabstimmung (K)
+holiday.de-AT15.date=2012-10-10
+holiday.de-AT16.name=Allerheiligen
+holiday.de-AT16.date=2012-11-01
+holiday.de-AT17.name=Martin (B)
+holiday.de-AT17.date=2012-11-11
+holiday.de-AT18.name=Leopold (W, N)
+holiday.de-AT18.date=2012-11-15
+holiday.de-AT19.name=Mariä Empfängnis
+holiday.de-AT19.date=2012-12-08
+holiday.de-AT20.name=Heiliger Abend
+holiday.de-AT20.date=2012-12-24
+holiday.de-AT21.name=Christtag
+holiday.de-AT21.date=2012-12-25
+holiday.de-AT22.name=Stefanitag
+holiday.de-AT22.date=2012-12-26
+holiday.de-AT23.name=Silvester
+holiday.de-AT23.date=2012-12-31
+holiday.de-AT24.name=Neujahr
+holiday.de-AT24.date=2013-01-01
+holiday.de-AT25.name=Heilige drei Könige
+holiday.de-AT25.date=2013-01-06
+holiday.de-AT26.name=Josef (K, St, T, V)
+holiday.de-AT26.date=2013-03-19
+holiday.de-AT27.name=Karfreitag
+holiday.de-AT27.date=2013-03-29
+holiday.de-AT28.name=Ostersonntag
+holiday.de-AT28.date=2013-03-31
+holiday.de-AT29.name=Ostermontag
+holiday.de-AT29.date=2013-04-01
+holiday.de-AT30.name=Staatsfeiertag
+holiday.de-AT30.date=2013-05-01
+holiday.de-AT31.name=Florian (O)
+holiday.de-AT31.date=2013-05-04
+holiday.de-AT32.name=Christi Himmelfahrt
+holiday.de-AT32.date=2013-05-09
+holiday.de-AT33.name=Pfingstsonntag
+holiday.de-AT33.date=2013-05-19
+holiday.de-AT34.name=Pfingstmontag
+holiday.de-AT34.date=2013-05-20
+holiday.de-AT35.name=Fronleichnam
+holiday.de-AT35.date=2013-05-30
+holiday.de-AT36.name=Mariä Himmelfahrt
+holiday.de-AT36.date=2013-08-15
+holiday.de-AT37.name=Rupert (S)
+holiday.de-AT37.date=2013-09-24
+holiday.de-AT38.name=Tag der Volksabstimmung (K)
+holiday.de-AT38.date=2013-10-10
+holiday.de-AT39.name=Allerheiligen
+holiday.de-AT39.date=2013-11-01
+holiday.de-AT40.name=Martin (B)
+holiday.de-AT40.date=2013-11-11
+holiday.de-AT41.name=Leopold (W, N)
+holiday.de-AT41.date=2013-11-15
+holiday.de-AT42.name=Mariä Empfängnis
+holiday.de-AT42.date=2013-12-08
+holiday.de-AT43.name=Heiliger Abend
+holiday.de-AT43.date=2013-12-24
+holiday.de-AT44.name=Christtag
+holiday.de-AT44.date=2013-12-25
+holiday.de-AT45.name=Stefanitag
+holiday.de-AT45.date=2013-12-26
+holiday.de-AT46.name=Silvester
+holiday.de-AT46.date=2013-12-31
diff --git a/doc/rc/holidays.de-DE.rc b/doc/rc/holidays.de-DE.rc
index 3a4b63b0b..72ba47fcc 100644
--- a/doc/rc/holidays.de-DE.rc
+++ b/doc/rc/holidays.de-DE.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Germany
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/de-DE/2012.json
+# http://holidata.net/de-DE/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,46 +25,141 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.neujahr.name=Neujahr
-holiday.neujahr.date=20110101
-holiday.heiligedreikonige.name=Heilige drei Könige (BW,BY,ST)
-holiday.heiligedreikonige.date=20110106
-holiday.karfreitag.name=Karfreitag
-holiday.karfreitag.date=20110422
-holiday.ostern.name=Ostern
-holiday.ostern.date=20110424
-holiday.ostermontag.name=Ostermontag
-holiday.ostermontag.date=20110425
-holiday.maifeiertag.name=Erster Maifeiertag
-holiday.maifeiertag.date=20110501
-holiday.christihimmelfahrt.name=Christi Himmelfahrt
-holiday.christihimmelfahrt.date=20110602
-holiday.pfingstsonntag.name=Pfingstsonntag
-holiday.pfingstsonntag.date=20110612
-holiday.pfingstmontag.name=Pfingstmontag
-holiday.pfingstmontag.date=20110613
-holiday.fronleichnam.name=Fronleichnam (BW,BY,HE,NRW,RP,SL,(SN,TH))
-holiday.fronleichnam.date=20110623
-holiday.mariahimmelfahrt.name=Mariä Himmelfahrt (SL)
-holiday.mariahimmelfahrt.date=20110815
-holiday.einheit.name=Tag der Deutschen Einheit
-holiday.einheit.date=20111003
-holiday.reformationstag.name=Reformationstag (BB,MV,SN,ST,TH)
-holiday.reformationstag.date=20111031
-holiday.allerheiligen.name=Allerheiligen (BW,BY,NRW,RP,SL)
-holiday.allerheiligen.date=20111101
-holiday.bussundbettag.name=Buss und Bettag (SN)
-holiday.bussundbettag.date=20111116
-holiday.heiligabend.name=Heilig Abend
-holiday.heiligabend.date=20111224
-holiday.weihnachtstag.name=Weihnachtstag
-holiday.weihnachtstag.date=20111225
-holiday.zweiterweihnachtstag.name=Zweiter Weihnachtstag
-holiday.zweiterweihnachtstag.date=20111226
-holiday.sylvester.name=Sylvester
-holiday.sylvester.date=20111231
+holiday.de-DE1.name=Neujahr
+holiday.de-DE1.date=2012-01-01
+holiday.de-DE2.name=Heilige drei Könige
+holiday.de-DE2.date=2012-01-06
+holiday.de-DE3.name=Heilige drei Könige
+holiday.de-DE3.date=2012-01-06
+holiday.de-DE4.name=Heilige drei Könige
+holiday.de-DE4.date=2012-01-06
+holiday.de-DE5.name=Karfreitag
+holiday.de-DE5.date=2012-04-06
+holiday.de-DE6.name=Ostern
+holiday.de-DE6.date=2012-04-08
+holiday.de-DE7.name=Ostermontag
+holiday.de-DE7.date=2012-04-09
+holiday.de-DE8.name=Erster Maifeiertag
+holiday.de-DE8.date=2012-05-01
+holiday.de-DE9.name=Christi Himmelfahrt
+holiday.de-DE9.date=2012-05-17
+holiday.de-DE10.name=Pfingstsonntag
+holiday.de-DE10.date=2012-05-27
+holiday.de-DE11.name=Pfingstmontag
+holiday.de-DE11.date=2012-05-28
+holiday.de-DE12.name=Fronleichnam
+holiday.de-DE12.date=2012-06-07
+holiday.de-DE13.name=Fronleichnam
+holiday.de-DE13.date=2012-06-07
+holiday.de-DE14.name=Fronleichnam
+holiday.de-DE14.date=2012-06-07
+holiday.de-DE15.name=Fronleichnam
+holiday.de-DE15.date=2012-06-07
+holiday.de-DE16.name=Fronleichnam
+holiday.de-DE16.date=2012-06-07
+holiday.de-DE17.name=Fronleichnam
+holiday.de-DE17.date=2012-06-07
+holiday.de-DE18.name=Mariä Himmelfahrt
+holiday.de-DE18.date=2012-08-15
+holiday.de-DE19.name=Tag der Deutschen Einheit
+holiday.de-DE19.date=2012-10-03
+holiday.de-DE20.name=Reformationstag
+holiday.de-DE20.date=2012-10-31
+holiday.de-DE21.name=Reformationstag
+holiday.de-DE21.date=2012-10-31
+holiday.de-DE22.name=Reformationstag
+holiday.de-DE22.date=2012-10-31
+holiday.de-DE23.name=Reformationstag
+holiday.de-DE23.date=2012-10-31
+holiday.de-DE24.name=Reformationstag
+holiday.de-DE24.date=2012-10-31
+holiday.de-DE25.name=Allerheiligen
+holiday.de-DE25.date=2012-11-01
+holiday.de-DE26.name=Allerheiligen
+holiday.de-DE26.date=2012-11-01
+holiday.de-DE27.name=Allerheiligen
+holiday.de-DE27.date=2012-11-01
+holiday.de-DE28.name=Allerheiligen
+holiday.de-DE28.date=2012-11-01
+holiday.de-DE29.name=Allerheiligen
+holiday.de-DE29.date=2012-11-01
+holiday.de-DE30.name=Buss und Bettag
+holiday.de-DE30.date=2012-11-21
+holiday.de-DE31.name=Heilig Abend
+holiday.de-DE31.date=2012-12-24
+holiday.de-DE32.name=Weihnachtstag
+holiday.de-DE32.date=2012-12-25
+holiday.de-DE33.name=Zweiter Weihnachtstag
+holiday.de-DE33.date=2012-12-26
+holiday.de-DE34.name=Sylvester
+holiday.de-DE34.date=2012-12-31
+holiday.de-DE35.name=Neujahr
+holiday.de-DE35.date=2013-01-01
+holiday.de-DE36.name=Heilige drei Könige
+holiday.de-DE36.date=2013-01-06
+holiday.de-DE37.name=Heilige drei Könige
+holiday.de-DE37.date=2013-01-06
+holiday.de-DE38.name=Heilige drei Könige
+holiday.de-DE38.date=2013-01-06
+holiday.de-DE39.name=Karfreitag
+holiday.de-DE39.date=2013-03-29
+holiday.de-DE40.name=Ostern
+holiday.de-DE40.date=2013-03-31
+holiday.de-DE41.name=Ostermontag
+holiday.de-DE41.date=2013-04-01
+holiday.de-DE42.name=Erster Maifeiertag
+holiday.de-DE42.date=2013-05-01
+holiday.de-DE43.name=Christi Himmelfahrt
+holiday.de-DE43.date=2013-05-09
+holiday.de-DE44.name=Pfingstsonntag
+holiday.de-DE44.date=2013-05-19
+holiday.de-DE45.name=Pfingstmontag
+holiday.de-DE45.date=2013-05-20
+holiday.de-DE46.name=Fronleichnam
+holiday.de-DE46.date=2013-05-30
+holiday.de-DE47.name=Fronleichnam
+holiday.de-DE47.date=2013-05-30
+holiday.de-DE48.name=Fronleichnam
+holiday.de-DE48.date=2013-05-30
+holiday.de-DE49.name=Fronleichnam
+holiday.de-DE49.date=2013-05-30
+holiday.de-DE50.name=Fronleichnam
+holiday.de-DE50.date=2013-05-30
+holiday.de-DE51.name=Fronleichnam
+holiday.de-DE51.date=2013-05-30
+holiday.de-DE52.name=Mariä Himmelfahrt
+holiday.de-DE52.date=2013-08-15
+holiday.de-DE53.name=Tag der Deutschen Einheit
+holiday.de-DE53.date=2013-10-03
+holiday.de-DE54.name=Reformationstag
+holiday.de-DE54.date=2013-10-31
+holiday.de-DE55.name=Reformationstag
+holiday.de-DE55.date=2013-10-31
+holiday.de-DE56.name=Reformationstag
+holiday.de-DE56.date=2013-10-31
+holiday.de-DE57.name=Reformationstag
+holiday.de-DE57.date=2013-10-31
+holiday.de-DE58.name=Reformationstag
+holiday.de-DE58.date=2013-10-31
+holiday.de-DE59.name=Allerheiligen
+holiday.de-DE59.date=2013-11-01
+holiday.de-DE60.name=Allerheiligen
+holiday.de-DE60.date=2013-11-01
+holiday.de-DE61.name=Allerheiligen
+holiday.de-DE61.date=2013-11-01
+holiday.de-DE62.name=Allerheiligen
+holiday.de-DE62.date=2013-11-01
+holiday.de-DE63.name=Allerheiligen
+holiday.de-DE63.date=2013-11-01
+holiday.de-DE64.name=Buss und Bettag
+holiday.de-DE64.date=2013-11-20
+holiday.de-DE65.name=Heilig Abend
+holiday.de-DE65.date=2013-12-24
+holiday.de-DE66.name=Weihnachtstag
+holiday.de-DE66.date=2013-12-25
+holiday.de-DE67.name=Zweiter Weihnachtstag
+holiday.de-DE67.date=2013-12-26
+holiday.de-DE68.name=Sylvester
+holiday.de-DE68.date=2013-12-31
diff --git a/doc/rc/holidays.en-CA.rc b/doc/rc/holidays.en-CA.rc
index a254b9469..3b1b38180 100644
--- a/doc/rc/holidays.en-CA.rc
+++ b/doc/rc/holidays.en-CA.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Canada
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-CA/2012.json
+# http://holidata.net/en-CA/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,35 +25,61 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.newyearsday.name=New Year's Day
-holiday.newyearsday.date=20110101
-holiday.familyday.name=Family Day
-holiday.familyday.date=20110117
-holiday.goodfriday.name=Good Friday
-holiday.goodfriday.date=20110422
-holiday.eastermonday.name=Easter Monday
-holiday.eastermonday.date=20110425
-holiday.victoriaday.name=Victoria Day
-holiday.victoriaday.date=20110524
-holiday.canadaday.name=Canada Day
-holiday.canadaday.date=20110701
-holiday.firstmondayofaugust.name=First Monday of August
-holiday.firstmondayofaugust.date=20110801
-holiday.labourday.name=Labour Day
-holiday.labourday.date=20110905
-holiday.thanksgiving.name=Thanksgiving Day
-holiday.thanksgiving.date=20111010
-holiday.remembranceday.name=Remembrance Day
-holiday.remembranceday.date=20111111
-holiday.christmasday.name=Christmas Day
-holiday.christmasday.date=20111225
-holiday.boxingday.name=Boxing Day
-holiday.boxingday.date=20111226
-holiday.newyearseve.name=New Year's Eve
-holiday.newyearseve.date=20111231
+###############################################################################
 
+holiday.en-CA1.name=New Year's Day
+holiday.en-CA1.date=2012-01-01
+holiday.en-CA2.name=New Year's Day (obs.)
+holiday.en-CA2.date=2012-01-02
+holiday.en-CA3.name=Family Day
+holiday.en-CA3.date=2012-02-20
+holiday.en-CA4.name=Good Friday
+holiday.en-CA4.date=2012-04-06
+holiday.en-CA5.name=Easter Monday
+holiday.en-CA5.date=2012-04-09
+holiday.en-CA6.name=Victoria Day
+holiday.en-CA6.date=2012-05-21
+holiday.en-CA7.name=Canada Day
+holiday.en-CA7.date=2012-07-01
+holiday.en-CA8.name=Canada Day (obs.)
+holiday.en-CA8.date=2012-07-02
+holiday.en-CA9.name=First Monday of August
+holiday.en-CA9.date=2012-08-06
+holiday.en-CA10.name=Labour Day
+holiday.en-CA10.date=2012-09-03
+holiday.en-CA11.name=Thanksgiving Day
+holiday.en-CA11.date=2012-10-08
+holiday.en-CA12.name=Remembrance Day
+holiday.en-CA12.date=2012-11-11
+holiday.en-CA13.name=Christmas Day
+holiday.en-CA13.date=2012-12-25
+holiday.en-CA14.name=Boxing Day
+holiday.en-CA14.date=2012-12-26
+holiday.en-CA15.name=New Year's Eve
+holiday.en-CA15.date=2012-12-31
+holiday.en-CA16.name=New Year's Day
+holiday.en-CA16.date=2013-01-01
+holiday.en-CA17.name=Family Day
+holiday.en-CA17.date=2013-02-18
+holiday.en-CA18.name=Good Friday
+holiday.en-CA18.date=2013-03-29
+holiday.en-CA19.name=Easter Monday
+holiday.en-CA19.date=2013-04-01
+holiday.en-CA20.name=Victoria Day
+holiday.en-CA20.date=2013-05-20
+holiday.en-CA21.name=Canada Day
+holiday.en-CA21.date=2013-07-01
+holiday.en-CA22.name=First Monday of August
+holiday.en-CA22.date=2013-08-05
+holiday.en-CA23.name=Labour Day
+holiday.en-CA23.date=2013-09-02
+holiday.en-CA24.name=Thanksgiving Day
+holiday.en-CA24.date=2013-10-14
+holiday.en-CA25.name=Remembrance Day
+holiday.en-CA25.date=2013-11-11
+holiday.en-CA26.name=Christmas Day
+holiday.en-CA26.date=2013-12-25
+holiday.en-CA27.name=Boxing Day
+holiday.en-CA27.date=2013-12-26
+holiday.en-CA28.name=New Year's Eve
+holiday.en-CA28.date=2013-12-31
diff --git a/doc/rc/holidays.en-GB.rc b/doc/rc/holidays.en-GB.rc
index 53db3547f..c735e0219 100644
--- a/doc/rc/holidays.en-GB.rc
+++ b/doc/rc/holidays.en-GB.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for the UK
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-GB/2012.json
+# http://holidata.net/en-GB/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,25 +25,41 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.newyear.name=New Year's Day
-holiday.newyear.date=20110101
-holiday.goodfriday.name=Good Friday
-holiday.goodfriday.date=20110422
-holiday.eastermonday.name=Easter Monday
-holiday.eastermonday.date=20110425
-holiday.may.name=Early May Bank Holiday
-holiday.may.date=20110502
-holiday.spring.name=Spring Bank Holiday
-holiday.spring.date=20110530
-holiday.august.name=August Bank Holiday
-holiday.august.date=20110829
-holiday.christmas.name=Christmas Day
-holiday.christmas.date=20111225
-holiday.boxingday.name=Boxing Day
-holiday.boxingday.date=20111226
+###############################################################################
 
+holiday.en-GB1.name=New Year's Day
+holiday.en-GB1.date=2012-01-01
+holiday.en-GB2.name=New Year's Day Holiday
+holiday.en-GB2.date=2012-01-02
+holiday.en-GB3.name=Good Friday
+holiday.en-GB3.date=2012-04-06
+holiday.en-GB4.name=Easter Monday
+holiday.en-GB4.date=2012-04-09
+holiday.en-GB5.name=Early May Bank Holiday
+holiday.en-GB5.date=2012-05-07
+holiday.en-GB6.name=Spring Bank Holiday
+holiday.en-GB6.date=2012-06-04
+holiday.en-GB7.name=Queen's Diamond Jubilee
+holiday.en-GB7.date=2012-06-05
+holiday.en-GB8.name=August Bank Holiday
+holiday.en-GB8.date=2012-08-27
+holiday.en-GB9.name=Christmas Day
+holiday.en-GB9.date=2012-12-25
+holiday.en-GB10.name=Boxing Day
+holiday.en-GB10.date=2012-12-26
+holiday.en-GB11.name=New Year's Day
+holiday.en-GB11.date=2013-01-01
+holiday.en-GB12.name=Good Friday
+holiday.en-GB12.date=2013-03-29
+holiday.en-GB13.name=Easter Monday
+holiday.en-GB13.date=2013-04-01
+holiday.en-GB14.name=Early May Bank Holiday
+holiday.en-GB14.date=2013-05-06
+holiday.en-GB15.name=Spring Bank Holiday
+holiday.en-GB15.date=2013-05-27
+holiday.en-GB16.name=August Bank Holiday
+holiday.en-GB16.date=2013-08-26
+holiday.en-GB17.name=Christmas Day
+holiday.en-GB17.date=2013-12-25
+holiday.en-GB18.name=Boxing Day
+holiday.en-GB18.date=2013-12-26
diff --git a/doc/rc/holidays.en-NZ.rc b/doc/rc/holidays.en-NZ.rc
index 11d4f0733..44aa966f3 100644
--- a/doc/rc/holidays.en-NZ.rc
+++ b/doc/rc/holidays.en-NZ.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for New Zealand
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-NZ/2012.json
+# http://holidata.net/en-NZ/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,81 +25,45 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.newyear.name=New Year's Day
-holiday.newyear.date=20110101
-holiday.dayafternewyearsday.name=Day after New Years Day
-holiday.dayafternewyearsday.date=20110102
-holiday.waitangiday.name=Waitangi Day
-holiday.waitangiday.date=20110206
-
-holiday.goodfriday.name=Good Friday
-holiday.goodfriday.date=20110422
-holiday.eastermonday.name=Easter Monday
-holiday.eastermonday.date=20110425
-
-holiday.anzacday.name=ANZAC Day
-holiday.anzacday.date=20110425
-holiday.queensbirthday.name=Queen's Birthday
-holiday.queensbirthday.date=20110606
-holiday.labourday.name=Labour Day
-holiday.labourday.date=20111024
-
-holiday.christmas.name=Christmas Day
-holiday.christmas.date=20111225
-holiday.boxingday.name=Boxing Day
-holiday.boxingday.date=20111226
-
-# 2012
-#holiday.newyear.name=New Year's Day
-#holiday.newyear.date=20120101
-#holiday.dayafternewyearsday.name=Day after New Years Day
-#holiday.dayafternewyearsday.date=20120102
-#holiday.waitangiday.name=Waitangi Day
-#holiday.waitangiday.date=20120206
-
-#holiday.goodfriday.name=Good Friday
-#holiday.goodfriday.date=20120406
-#holiday.eastermonday.name=Easter Monday
-#holiday.eastermonday.date=20120409
-
-#holiday.anzacday.name=ANZAC Day
-#holiday.anzacday.date=20120425
-#holiday.queensbirthday.name=Queen's Birthday
-#holiday.queensbirthday.date=20120604
-#holiday.labourday.name=Labour Day
-#holiday.labourday.date=20121022
-
-#holiday.christmas.name=Christmas Day
-#holiday.christmas.date=20121225
-#holiday.boxingday.name=Boxing Day
-#holiday.boxingday.date=20121226
-
-# 2013
-#holiday.newyear.name=New Year's Day
-#holiday.newyear.date=20130101
-#holiday.dayafternewyearsday.name=Day after New Years Day
-#holiday.dayafternewyearsday.date=20130102
-#holiday.waitangiday.name=Waitangi Day
-#holiday.waitangiday.date=20130206
-
-#holiday.goodfriday.name=Good Friday
-#holiday.goodfriday.date=20130329
-#holiday.eastermonday.name=Easter Monday
-#holiday.eastermonday.date=20130401
-
-#holiday.anzacday.name=ANZAC Day
-#holiday.anzacday.date=20130425
-#holiday.queensbirthday.name=Queen's Birthday
-#holiday.queensbirthday.date=20130603
-#holiday.labourday.name=Labour Day
-#holiday.labourday.date=20131028
-
-#holiday.christmas.name=Christmas Day
-#holiday.christmas.date=20131225
-#holiday.boxingday.name=Boxing Day
-#holiday.boxingday.date=20131226
+holiday.en-NZ1.name=New Year's Day
+holiday.en-NZ1.date=2012-01-01
+holiday.en-NZ2.name=Day after New Years Day
+holiday.en-NZ2.date=2012-01-02
+holiday.en-NZ3.name=Waitangi Day
+holiday.en-NZ3.date=2012-02-06
+holiday.en-NZ4.name=Good Friday
+holiday.en-NZ4.date=2012-04-06
+holiday.en-NZ5.name=Easter Monday
+holiday.en-NZ5.date=2012-04-09
+holiday.en-NZ6.name=ANZAC Day
+holiday.en-NZ6.date=2012-04-25
+holiday.en-NZ7.name=Queen's Birthday
+holiday.en-NZ7.date=2012-06-04
+holiday.en-NZ8.name=Labour Day
+holiday.en-NZ8.date=2012-10-22
+holiday.en-NZ9.name=Christmas Day
+holiday.en-NZ9.date=2012-12-25
+holiday.en-NZ10.name=Boxing Day
+holiday.en-NZ10.date=2012-12-26
+holiday.en-NZ11.name=New Year's Day
+holiday.en-NZ11.date=2013-01-01
+holiday.en-NZ12.name=Day after New Years Day
+holiday.en-NZ12.date=2013-01-02
+holiday.en-NZ13.name=Waitangi Day
+holiday.en-NZ13.date=2013-02-06
+holiday.en-NZ14.name=Good Friday
+holiday.en-NZ14.date=2013-03-29
+holiday.en-NZ15.name=Easter Monday
+holiday.en-NZ15.date=2013-04-01
+holiday.en-NZ16.name=ANZAC Day
+holiday.en-NZ16.date=2013-04-25
+holiday.en-NZ17.name=Queen's Birthday
+holiday.en-NZ17.date=2013-06-03
+holiday.en-NZ18.name=Labour Day
+holiday.en-NZ18.date=2013-10-28
+holiday.en-NZ19.name=Christmas Day
+holiday.en-NZ19.date=2013-12-25
+holiday.en-NZ20.name=Boxing Day
+holiday.en-NZ20.date=2013-12-26
diff --git a/doc/rc/holidays.en-US.rc b/doc/rc/holidays.en-US.rc
index 770ae232f..e00e5c89c 100644
--- a/doc/rc/holidays.en-US.rc
+++ b/doc/rc/holidays.en-US.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for the US
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/en-US/2012.json
+# http://holidata.net/en-US/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,33 +25,55 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.newyearsday.name=New Year's Day
-holiday.newyearsday.date=20110101
-holiday.martinlutherkingday.name=Birthday of Martin Luther King, Jr.
-holiday.martinlutherkingday.date=20110117
-holiday.presidentsday.name=Washington's Birthday
-holiday.presidentsday.date=20110221
-holiday.patriotsday.name=Patriots' Day
-holiday.patriotsday.date=20110419
-holiday.memorialday.name=Memorial Day
-holiday.memorialday.date=20110530
-holiday.independenceday.name=Independence Day
-holiday.independenceday.date=20110704
-holiday.laborday.name=Labor Day
-holiday.laborday.date=20110905
-holiday.columbusday.name=Columbus Day
-holiday.columbusday.date=20111010
-holiday.veteransdays.name=Veterans Day
-holiday.veteransdays.date=20111111
-holiday.thanksgiving.name=Thanksgiving Day
-holiday.thanksgiving.date=20111124
-holiday.christmasday.name=Christmas Day
-holiday.christmasday.date=20111225
-holiday.newyearseve.name=New Year's Eve
-holiday.newyearseve.date=20111231
+###############################################################################
 
+holiday.en-US1.name=New Year's Day
+holiday.en-US1.date=2012-01-01
+holiday.en-US2.name=New Year's Day
+holiday.en-US2.date=2012-01-02
+holiday.en-US3.name=Birthday of Martin Luther King, Jr.
+holiday.en-US3.date=2012-01-16
+holiday.en-US4.name=Washington's Birthday
+holiday.en-US4.date=2012-02-20
+holiday.en-US5.name=Patriots' Day
+holiday.en-US5.date=2012-04-16
+holiday.en-US6.name=Patriots' Day
+holiday.en-US6.date=2012-04-16
+holiday.en-US7.name=Memorial Day
+holiday.en-US7.date=2012-05-28
+holiday.en-US8.name=Independence Day
+holiday.en-US8.date=2012-07-04
+holiday.en-US9.name=Labor Day
+holiday.en-US9.date=2012-09-03
+holiday.en-US10.name=Columbus Day
+holiday.en-US10.date=2012-10-08
+holiday.en-US11.name=Veterans Day
+holiday.en-US11.date=2012-11-12
+holiday.en-US12.name=Thanksgiving Day
+holiday.en-US12.date=2012-11-22
+holiday.en-US13.name=Christmas Day
+holiday.en-US13.date=2012-12-25
+holiday.en-US14.name=New Year's Day
+holiday.en-US14.date=2013-01-01
+holiday.en-US15.name=Birthday of Martin Luther King, Jr.
+holiday.en-US15.date=2013-01-21
+holiday.en-US16.name=Washington's Birthday
+holiday.en-US16.date=2013-02-18
+holiday.en-US17.name=Patriots' Day
+holiday.en-US17.date=2013-04-15
+holiday.en-US18.name=Patriots' Day
+holiday.en-US18.date=2013-04-15
+holiday.en-US19.name=Memorial Day
+holiday.en-US19.date=2013-05-27
+holiday.en-US20.name=Independence Day
+holiday.en-US20.date=2013-07-04
+holiday.en-US21.name=Labor Day
+holiday.en-US21.date=2013-09-02
+holiday.en-US22.name=Columbus Day
+holiday.en-US22.date=2013-10-14
+holiday.en-US23.name=Veterans Day
+holiday.en-US23.date=2013-11-11
+holiday.en-US24.name=Thanksgiving Day
+holiday.en-US24.date=2013-11-28
+holiday.en-US25.name=Christmas Day
+holiday.en-US25.date=2013-12-25
diff --git a/doc/rc/holidays.es-ES.rc b/doc/rc/holidays.es-ES.rc
index 1fd13be67..96362ff8d 100644
--- a/doc/rc/holidays.es-ES.rc
+++ b/doc/rc/holidays.es-ES.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Spain
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/es-ES/2012.json
+# http://holidata.net/es-ES/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,32 +25,55 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.anonuevo.name=Año Nuevo
-holiday.anonuevo.date=20110101
-holiday.reyes.name=Día de los Reyes
-holiday.reyes.date=20110106
-holiday.viernessanto.name=Viernes Santo
-holiday.viernessanto.date=20110422
-holiday.trabajo.name=Fiesta del Trabajo
-holiday.trabajo.date=20110501
-holiday.virgen.name=Asunción de la Virgen
-holiday.virgen.date=20110815
-holiday.fiestanacional.name=Fiesta Nacional de España
-holiday.fiestanacional.date=20111012
-holiday.santos.name=Dia de todos los Santos
-holiday.santos.date=20111101
-holiday.constitucion.name=Dia de la Constitución
-holiday.constitucion.date=20111206
-holiday.concepcion.name=Inmaculada Concepción
-holiday.concepcion.date=20111208
-holiday.nochebuena.name=Noche Buena
-holiday.nochebuena.date=20111224
-holiday.navidad.name=Navidad
-holiday.navidad.date=20111225
-holiday.nochevieja.name=Noche Vieja
-holiday.nochevieja.date=20111231
+holiday.es-ES1.name=Año Nuevo
+holiday.es-ES1.date=2012-01-01
+holiday.es-ES2.name=Día de los Reyes
+holiday.es-ES2.date=2012-01-06
+holiday.es-ES3.name=Viernes Santo
+holiday.es-ES3.date=2012-04-06
+holiday.es-ES4.name=Fiesta del Trabajo
+holiday.es-ES4.date=2012-05-01
+holiday.es-ES5.name=Asunción de la Virgen
+holiday.es-ES5.date=2012-08-15
+holiday.es-ES6.name=Fiesta Nacional de España
+holiday.es-ES6.date=2012-10-12
+holiday.es-ES7.name=Dia de todos los Santos
+holiday.es-ES7.date=2012-11-01
+holiday.es-ES8.name=Dia de la Constitución
+holiday.es-ES8.date=2012-12-06
+holiday.es-ES9.name=Inmaculada Concepción
+holiday.es-ES9.date=2012-12-08
+holiday.es-ES10.name=Noche Buena
+holiday.es-ES10.date=2012-12-24
+holiday.es-ES11.name=Navidad
+holiday.es-ES11.date=2012-12-25
+holiday.es-ES12.name=Noche Vieja
+holiday.es-ES12.date=2012-12-31
+holiday.es-ES13.name=Año Nuevo
+holiday.es-ES13.date=2013-01-01
+holiday.es-ES14.name=Día de los Reyes
+holiday.es-ES14.date=2013-01-06
+holiday.es-ES15.name=Viernes Santo
+holiday.es-ES15.date=2013-03-29
+holiday.es-ES16.name=Pascua
+holiday.es-ES16.date=2013-03-31
+holiday.es-ES17.name=Fiesta del Trabajo
+holiday.es-ES17.date=2013-05-01
+holiday.es-ES18.name=Asunción de la Virgen
+holiday.es-ES18.date=2013-08-15
+holiday.es-ES19.name=Fiesta Nacional de España
+holiday.es-ES19.date=2013-10-12
+holiday.es-ES20.name=Dia de todos los Santos
+holiday.es-ES20.date=2013-11-01
+holiday.es-ES21.name=Dia de la Constitución
+holiday.es-ES21.date=2013-12-06
+holiday.es-ES22.name=Inmaculada Concepción
+holiday.es-ES22.date=2013-12-08
+holiday.es-ES23.name=Noche Buena
+holiday.es-ES23.date=2013-12-24
+holiday.es-ES24.name=Navidad
+holiday.es-ES24.date=2013-12-25
+holiday.es-ES25.name=Noche Vieja
+holiday.es-ES25.date=2013-12-31
diff --git a/doc/rc/holidays.fr-FR.rc b/doc/rc/holidays.fr-FR.rc
index 9479193be..96fb35645 100644
--- a/doc/rc/holidays.fr-FR.rc
+++ b/doc/rc/holidays.fr-FR.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for France
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/fr-FR/2012.json
+# http://holidata.net/fr-FR/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,29 +25,49 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.jourdelan.name=Jour de l'an
-holiday.jourdelan.date=20110101
-holiday.travail.name=Fête du premier mai
-holiday.travail.date=20110501
-holiday.victoire.name=la Fête de Victoire 45
-holiday.victoire.date=20110508
-holiday.ascencion.name=l'Ascencion
-holiday.ascencion.date=20110602
-holiday.pentecôte.name=la Pentecôte
-holiday.pentecôte.date=20110612
-holiday.bastille.name=Fête nationale
-holiday.bastille.date=20110714
-holiday.assomption.name=Assomption
-holiday.assomption.date=20110815
-holiday.toussaint.name=La Toussaint
-holiday.toussaint.date=20111101
-holiday.armistice.name=Jour d'armistice
-holiday.armistice.date=20111111
-holiday.noël.name=Noël
-holiday.noël.date=20111225
+###############################################################################
 
+holiday.fr-FR1.name=Jour de l'an
+holiday.fr-FR1.date=2012-01-01
+holiday.fr-FR2.name=Lundi de Pâques
+holiday.fr-FR2.date=2012-04-09
+holiday.fr-FR3.name=Fête du premier mai
+holiday.fr-FR3.date=2012-05-01
+holiday.fr-FR4.name=Armistice 1945
+holiday.fr-FR4.date=2012-05-08
+holiday.fr-FR5.name=Ascencion
+holiday.fr-FR5.date=2012-05-17
+holiday.fr-FR6.name=Pentecôte
+holiday.fr-FR6.date=2012-05-28
+holiday.fr-FR7.name=Fête nationale
+holiday.fr-FR7.date=2012-07-14
+holiday.fr-FR8.name=Assomption
+holiday.fr-FR8.date=2012-08-15
+holiday.fr-FR9.name=Toussaint
+holiday.fr-FR9.date=2012-11-01
+holiday.fr-FR10.name=Armistice 1918
+holiday.fr-FR10.date=2012-11-11
+holiday.fr-FR11.name=Noël
+holiday.fr-FR11.date=2012-12-25
+holiday.fr-FR12.name=Jour de l'an
+holiday.fr-FR12.date=2013-01-01
+holiday.fr-FR13.name=Lundi de Pâques
+holiday.fr-FR13.date=2013-04-01
+holiday.fr-FR14.name=Fête du premier mai
+holiday.fr-FR14.date=2013-05-01
+holiday.fr-FR15.name=Armistice 1945
+holiday.fr-FR15.date=2013-05-08
+holiday.fr-FR16.name=Ascencion
+holiday.fr-FR16.date=2013-05-09
+holiday.fr-FR17.name=Pentecôte
+holiday.fr-FR17.date=2013-05-19
+holiday.fr-FR18.name=Fête nationale
+holiday.fr-FR18.date=2013-07-14
+holiday.fr-FR19.name=Assomption
+holiday.fr-FR19.date=2013-08-15
+holiday.fr-FR20.name=Toussaint
+holiday.fr-FR20.date=2013-11-01
+holiday.fr-FR21.name=Armistice 1918
+holiday.fr-FR21.date=2013-11-11
+holiday.fr-FR22.name=Noël
+holiday.fr-FR22.date=2013-12-25
diff --git a/doc/rc/holidays.it-IT.rc b/doc/rc/holidays.it-IT.rc
index 720d84927..d1b813047 100644
--- a/doc/rc/holidays.it-IT.rc
+++ b/doc/rc/holidays.it-IT.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for IT
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/it-IT/2012.json
+# http://holidata.net/it-IT/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,44 +25,53 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-
-# fisse (legali)
-holiday.capodanno.name=Capodanno
-holiday.capodanno.date=20110101
-holiday.sanmarco.name=Festa della liberazione
-holiday.sanmarco.date=20110425
-holiday.lavoratori.name=Festa del lavoro
-holiday.lavoratori.date=20110501
-holiday.repubblica.name=Festa della repubblica
-holiday.repubblica.date=20110602
-
-# fisse (cristiane)
-holiday.epifania.name=Epifania
-holiday.epifania.date=20110106
-holiday.ferragosto.name=Assunzione (ferragosto)
-holiday.ferragosto.date=20110815
-holiday.ognissanti.name=Ognissanti
-holiday.ognissanti.date=20111101
-holiday.madonna.name=Immacolata concezione
-holiday.madonna.date=20111208
-holiday.natale.name=Natale
-holiday.natale.date=20111225
-holiday.sstefano.name=S.to Stefano
-holiday.sstefano.date=20111226
-
-# variabili (cristiane)
-holiday.carnevale.name=Carnevale
-holiday.carnevale.date=20110308
-holiday.pasqua.name=Pasqua
-holiday.pasqua.date=20110424
-# nel 2011 coincide con la festa della liberazione
-#holiday.pasqua.name=Pasquetta
-#holiday.pasqua.date=20110425
-
-# 2012
+###############################################################################
 
+holiday.it-IT1.name=Capodanno
+holiday.it-IT1.date=2012-01-01
+holiday.it-IT2.name=Epifania
+holiday.it-IT2.date=2012-01-06
+holiday.it-IT3.name=Carnevale
+holiday.it-IT3.date=2012-03-08
+holiday.it-IT4.name=Pasqua
+holiday.it-IT4.date=2012-04-09
+holiday.it-IT5.name=Festa della liberazione
+holiday.it-IT5.date=2012-04-25
+holiday.it-IT6.name=Festa del lavoro
+holiday.it-IT6.date=2012-05-01
+holiday.it-IT7.name=Festa della repubblica
+holiday.it-IT7.date=2012-06-02
+holiday.it-IT8.name=Assunzione (ferragosto)
+holiday.it-IT8.date=2012-08-15
+holiday.it-IT9.name=Ognissanti
+holiday.it-IT9.date=2012-11-01
+holiday.it-IT10.name=Immacolata concezione
+holiday.it-IT10.date=2012-12-08
+holiday.it-IT11.name=Natale
+holiday.it-IT11.date=2012-12-25
+holiday.it-IT12.name=S.to Stefano
+holiday.it-IT12.date=2012-12-26
+holiday.it-IT13.name=Capodanno
+holiday.it-IT13.date=2013-01-01
+holiday.it-IT14.name=Epifania
+holiday.it-IT14.date=2013-01-06
+holiday.it-IT15.name=Carnevale
+holiday.it-IT15.date=2013-02-10
+holiday.it-IT16.name=Pasqua
+holiday.it-IT16.date=2013-04-01
+holiday.it-IT17.name=Festa della liberazione
+holiday.it-IT17.date=2013-04-25
+holiday.it-IT18.name=Festa del lavoro
+holiday.it-IT18.date=2013-05-01
+holiday.it-IT19.name=Festa della repubblica
+holiday.it-IT19.date=2013-06-02
+holiday.it-IT20.name=Assunzione (ferragosto)
+holiday.it-IT20.date=2013-08-15
+holiday.it-IT21.name=Ognissanti
+holiday.it-IT21.date=2013-11-01
+holiday.it-IT22.name=Immacolata concezione
+holiday.it-IT22.date=2013-12-08
+holiday.it-IT23.name=Natale
+holiday.it-IT23.date=2013-12-25
+holiday.it-IT24.name=S.to Stefano
+holiday.it-IT24.date=2013-12-26
diff --git a/doc/rc/holidays.jp-JP.rc b/doc/rc/holidays.jp-JP.rc
index 09ea8ae02..1b395792f 100644
--- a/doc/rc/holidays.jp-JP.rc
+++ b/doc/rc/holidays.jp-JP.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for JP
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/jp-JP/2012.json
+# http://holidata.net/jp-JP/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,113 +25,75 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.元日.name=元日
-holiday.元日.date=20110101
-holiday.成人の日.name=成人の日
-holiday.成人の日.date=20110110
-holiday.建国記念の日.name=建国記念の日
-holiday.建国記念の日.date=20110211
-holiday.春分の日.name=春分の日
-holiday.春分の日.date=20110321
-holiday.昭和の日.name=昭和の日
-holiday.昭和の日.date=20110429
-holiday.憲法記念日.name=憲法記念日
-holiday.憲法記念日.date=20110503
-holiday.みどりの日.name=みどりの日
-holiday.みどりの日.date=20110504
-holiday.こどもの日.name=こどもの日
-holiday.こどもの日.date=20110505
-holiday.海の日.name=海の日
-holiday.海の日.date=20110718
-holiday.敬老の日.name=敬老の日
-holiday.敬老の日.date=20110919
-holiday.秋分の日.name=秋分の日
-holiday.秋分の日.date=20110923
-holiday.体育の日.name=体育の日
-holiday.体育の日.date=20111010
-holiday.文化の日.name=文化の日
-holiday.文化の日.date=20111103
-holiday.勤労感謝の日.name=勤労感謝の日
-holiday.勤労感謝の日.date=20111123
-holiday.天皇誕生日.name=天皇誕生日
-holiday.天皇誕生日.date=20111223
-
-# 2012
-#holiday.元日.name=元日
-#holiday.元日.date=20120101
-#holiday.振替休日.name=振替休日
-#holiday.振替休日.date=20120102
-#holiday.成人の日.name=成人の日
-#holiday.成人の日.date=20120109
-#holiday.建国記念の日.name=建国記念の日
-#holiday.建国記念の日.date=20120211
-#holiday.春分の日.name=春分の日
-#holiday.春分の日.date=20120320
-#holiday.昭和の日.name=昭和の日
-#holiday.昭和の日.date=20120429
-#holiday.振替休日.name=振替休日
-#holiday.振替休日.date=20120430
-#holiday.憲法記念日.name=憲法記念日
-#holiday.憲法記念日.date=20120503
-#holiday.みどりの日.name=みどりの日
-#holiday.みどりの日.date=20120504
-#holiday.こどもの日.name=こどもの日
-#holiday.こどもの日.date=20120505
-#holiday.海の日.name=海の日
-#holiday.海の日.date=20120716
-#holiday.敬老の日.name=敬老の日
-#holiday.敬老の日.date=20120917
-#holiday.秋分の日.name=秋分の日
-#holiday.秋分の日.date=20120922
-#holiday.体育の日.name=体育の日
-#holiday.体育の日.date=20121008
-#holiday.文化の日.name=文化の日
-#holiday.文化の日.date=20121103
-#holiday.勤労感謝の日.name=勤労感謝の日
-#holiday.勤労感謝の日.date=20121123
-#holiday.天皇誕生日.name=天皇誕生日
-#holiday.天皇誕生日.date=20121223
-#holiday.振替休日.name=振替休日
-#holiday.振替休日.date=20121224
-
-# 2013
-#holiday.元日.name=元日
-#holiday.元日.date=20130101
-#holiday.成人の日.name=成人の日
-#holiday.成人の日.date=20130114
-#holiday.建国記念の日.name=建国記念の日
-#holiday.建国記念の日.date=20130211
-#holiday.春分の日.name=春分の日
-#holiday.春分の日.date=20130320
-#holiday.昭和の日.name=昭和の日
-#holiday.昭和の日.date=20130429
-#holiday.憲法記念日.name=憲法記念日
-#holiday.憲法記念日.date=20130503
-#holiday.みどりの日.name=みどりの日
-#holiday.みどりの日.date=20130504
-#holiday.こどもの日.name=こどもの日
-#holiday.こどもの日.date=20130505
-#holiday.振替休日.name=振替休日
-#holiday.振替休日.date=20130506
-#holiday.海の日.name=海の日
-#holiday.海の日.date=20130715
-#holiday.敬老の日.name=敬老の日
-#holiday.敬老の日.date=20130919
-#holiday.秋分の日.name=秋分の日
-#holiday.秋分の日.date=20130923
-#holiday.体育の日.name=体育の日
-#holiday.体育の日.date=20131014
-#holiday.文化の日.name=文化の日
-#holiday.文化の日.date=20131103
-#holiday.振替休日.name=振替休日
-#holiday.振替休日.date=20131104
-#holiday.勤労感謝の日.name=勤労感謝の日
-#holiday.勤労感謝の日.date=20131123
-#holiday.天皇誕生日.name=天皇誕生日
-#holiday.天皇誕生日.date=20131223
+###############################################################################
 
+holiday.jp-JP1.name=元日
+holiday.jp-JP1.date=2012-01-01
+holiday.jp-JP2.name=振替休日
+holiday.jp-JP2.date=2012-01-02
+holiday.jp-JP3.name=成人の日
+holiday.jp-JP3.date=2012-01-09
+holiday.jp-JP4.name=建国記念の日
+holiday.jp-JP4.date=2012-02-11
+holiday.jp-JP5.name=春分の日
+holiday.jp-JP5.date=2012-03-20
+holiday.jp-JP6.name=昭和の日
+holiday.jp-JP6.date=2012-04-29
+holiday.jp-JP7.name=振替休日
+holiday.jp-JP7.date=2012-04-30
+holiday.jp-JP8.name=憲法記念日
+holiday.jp-JP8.date=2012-05-03
+holiday.jp-JP9.name=みどりの日
+holiday.jp-JP9.date=2012-05-04
+holiday.jp-JP10.name=こどもの日
+holiday.jp-JP10.date=2012-05-05
+holiday.jp-JP11.name=海の日
+holiday.jp-JP11.date=2012-07-16
+holiday.jp-JP12.name=敬老の日
+holiday.jp-JP12.date=2012-09-17
+holiday.jp-JP13.name=秋分の日
+holiday.jp-JP13.date=2012-09-22
+holiday.jp-JP14.name=体育の日
+holiday.jp-JP14.date=2012-10-08
+holiday.jp-JP15.name=文化の日
+holiday.jp-JP15.date=2012-11-03
+holiday.jp-JP16.name=勤労感謝の日
+holiday.jp-JP16.date=2012-11-23
+holiday.jp-JP17.name=天皇誕生日
+holiday.jp-JP17.date=2012-12-23
+holiday.jp-JP18.name=振替休日
+holiday.jp-JP18.date=2012-12-24
+holiday.jp-JP19.name=元日
+holiday.jp-JP19.date=2013-01-01
+holiday.jp-JP20.name=成人の日
+holiday.jp-JP20.date=2013-01-14
+holiday.jp-JP21.name=建国記念の日
+holiday.jp-JP21.date=2013-02-11
+holiday.jp-JP22.name=春分の日
+holiday.jp-JP22.date=2013-03-20
+holiday.jp-JP23.name=昭和の日
+holiday.jp-JP23.date=2013-04-29
+holiday.jp-JP24.name=憲法記念日
+holiday.jp-JP24.date=2013-05-03
+holiday.jp-JP25.name=みどりの日
+holiday.jp-JP25.date=2013-05-04
+holiday.jp-JP26.name=こどもの日
+holiday.jp-JP26.date=2013-05-05
+holiday.jp-JP27.name=振替休日
+holiday.jp-JP27.date=2013-05-06
+holiday.jp-JP28.name=海の日
+holiday.jp-JP28.date=2013-07-15
+holiday.jp-JP29.name=敬老の日
+holiday.jp-JP29.date=2013-09-19
+holiday.jp-JP30.name=秋分の日
+holiday.jp-JP30.date=2013-09-23
+holiday.jp-JP31.name=体育の日
+holiday.jp-JP31.date=2013-10-14
+holiday.jp-JP32.name=文化の日
+holiday.jp-JP32.date=2013-11-03
+holiday.jp-JP33.name=振替休日
+holiday.jp-JP33.date=2013-11-04
+holiday.jp-JP34.name=勤労感謝の日
+holiday.jp-JP34.date=2013-11-23
+holiday.jp-JP35.name=天皇誕生日
+holiday.jp-JP35.date=2013-12-23
diff --git a/doc/rc/holidays.nb-NO.rc b/doc/rc/holidays.nb-NO.rc
index e3d40fd83..3c46821a6 100644
--- a/doc/rc/holidays.nb-NO.rc
+++ b/doc/rc/holidays.nb-NO.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Norway
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/nb-NO/2012.json
+# http://holidata.net/nb-NO/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,79 +25,73 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.nyttårsdag.name=Nyttårsdag
-holiday.nyttårsdag.date=20110101
-holiday.fastelavn.name=Fastelavn
-holiday.fastelavn.date=20110306
-holiday.palmesøndag.name=Palmesøndag
-holiday.palmesøndag.date=20110417
-holiday.skjærtorsdag.name=Skjærtorsdag
-holiday.skjærtorsdag.date=20110421
-holiday.langfredag.name=Langfredag
-holiday.langfredag.date=20110422
-holiday.påskedag.name=Påskedag
-holiday.påskedag.date=20110424
-holiday.påskedag2.name=Påskedag
-holiday.påskedag2.date=20110425
-holiday.offentlighøytidsdag.name=Offentlig Høytidsdag
-holiday.offentlighøytidsdag.date=20110501
-holiday.frigjøringsdag.name=Frigjøringsdag 1945
-holiday.frigjøringsdag.date=20110508
-holiday.grunnlovsdag.name=Grunnlovsdag
-holiday.grunnlovsdag.date=20110517
-holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag
-holiday.KristiHimmelfartsdag.date=20110602
-holiday.pinsedag.name=Pinsedag
-holiday.pinsedag.date=20110612
-holiday.pinsedag2.name=Pinsedag
-holiday.pinsedag2.date=20110613
-holiday.julaften.name=Julaften
-holiday.julaften.date=20111224
-holiday.juledag.name=Juledag
-holiday.juledag.date=20111225
-holiday.juledag2.name=Juledag
-holiday.juledag2.date=20111226
-holiday.nyttårsaften.name=Nyttårsaften
-holiday.nyttårsaften.date=20111231
-
-# 2012
-#holiday.nyttårsdag.name=Nyttårsdag
-#holiday.nyttårsdag.date=20120101
-#holiday.fastelavn.name=Fastelavn
-#holiday.fastelavn.date=20120219
-#holiday.palmesøndag.name=Palmesøndag
-#holiday.palmesøndag.date=20120401
-#holiday.skjærtorsdag.name=Skjærtorsdag
-#holiday.skjærtorsdag.date=20120405
-#holiday.langfredag.name=Langfredag
-#holiday.langfredag.date=20120406
-#holiday.påskedag.name=Påskedag
-#holiday.påskedag.date=20120408
-#holiday.påskedag2.name=Påskedag
-#holiday.påskedag2.date=20120409
-#holiday.offentlighøytidsdag.name=Offentlig Høytidsdag
-#holiday.offentlighøytidsdag.date=20120501
-#holiday.frigjøringsdag.name=Frigjøringsdag 1945
-#holiday.frigjøringsdag.date=20120508
-#holiday.grunnlovsdag.name=Grunnlovsdag
-#holiday.grunnlovsdag.date=20120517
-#holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag
-#holiday.KristiHimmelfartsdag.date=20120517
-#holiday.pinsedag.name=Pinsedag
-#holiday.pinsedag.date=20120527
-#holiday.pinsedag2.name=Pinsedag
-#holiday.pinsedag2.date=20120528
-#holiday.julaften.name=Julaften
-#holiday.julaften.date=20121224
-#holiday.juledag.name=Juledag
-#holiday.juledag.date=20121225
-#holiday.juledag2.name=Juledag
-#holiday.juledag2.date=20121226
-#holiday.nyttårsaften.name=Nyttårsaften
-#holiday.nyttårsaften.date=20121231
+###############################################################################
 
+holiday.nb-NO1.name=Nyttårsdag
+holiday.nb-NO1.date=2012-01-01
+holiday.nb-NO2.name=Fastelavn
+holiday.nb-NO2.date=2012-02-19
+holiday.nb-NO3.name=Palmesøndag
+holiday.nb-NO3.date=2012-04-01
+holiday.nb-NO4.name=Skjærtorsdag
+holiday.nb-NO4.date=2012-04-05
+holiday.nb-NO5.name=Langfredag
+holiday.nb-NO5.date=2012-04-06
+holiday.nb-NO6.name=Påskedag
+holiday.nb-NO6.date=2012-04-08
+holiday.nb-NO7.name=Påskedag
+holiday.nb-NO7.date=2012-04-09
+holiday.nb-NO8.name=Offentlig Høytidsdag
+holiday.nb-NO8.date=2012-05-01
+holiday.nb-NO9.name=Frigjøringsdag 1945
+holiday.nb-NO9.date=2012-05-08
+holiday.nb-NO10.name=Grunnlovsdag
+holiday.nb-NO10.date=2012-05-17
+holiday.nb-NO11.name=Kristi Himmelfartsdag
+holiday.nb-NO11.date=2012-05-17
+holiday.nb-NO12.name=Pinsedag
+holiday.nb-NO12.date=2012-05-27
+holiday.nb-NO13.name=Pinsedag
+holiday.nb-NO13.date=2012-05-28
+holiday.nb-NO14.name=Julaften
+holiday.nb-NO14.date=2012-12-24
+holiday.nb-NO15.name=Juledag
+holiday.nb-NO15.date=2012-12-25
+holiday.nb-NO16.name=Juledag
+holiday.nb-NO16.date=2012-12-26
+holiday.nb-NO17.name=Nyttårsaften
+holiday.nb-NO17.date=2012-12-31
+holiday.nb-NO18.name=Nyttårsdag
+holiday.nb-NO18.date=2013-01-01
+holiday.nb-NO19.name=Fastelavn
+holiday.nb-NO19.date=2013-02-10
+holiday.nb-NO20.name=Palmesøndag
+holiday.nb-NO20.date=2013-03-24
+holiday.nb-NO21.name=Skjærtorsdag
+holiday.nb-NO21.date=2013-03-28
+holiday.nb-NO22.name=Langfredag
+holiday.nb-NO22.date=2013-03-29
+holiday.nb-NO23.name=Påskedag
+holiday.nb-NO23.date=2013-03-31
+holiday.nb-NO24.name=Påskedag
+holiday.nb-NO24.date=2013-04-01
+holiday.nb-NO25.name=Offentlig Høytidsdag
+holiday.nb-NO25.date=2013-05-01
+holiday.nb-NO26.name=Frigjøringsdag 1945
+holiday.nb-NO26.date=2013-05-08
+holiday.nb-NO27.name=Grunnlovsdag
+holiday.nb-NO27.date=2013-05-17
+holiday.nb-NO28.name=Kristi Himmelfartsdag
+holiday.nb-NO28.date=2013-05-09
+holiday.nb-NO29.name=Pinsedag
+holiday.nb-NO29.date=2013-05-19
+holiday.nb-NO30.name=Pinsedag
+holiday.nb-NO30.date=2013-05-20
+holiday.nb-NO31.name=Julaften
+holiday.nb-NO31.date=2013-12-24
+holiday.nb-NO32.name=Juledag
+holiday.nb-NO32.date=2013-12-25
+holiday.nb-NO33.name=Juledag
+holiday.nb-NO33.date=2013-12-26
+holiday.nb-NO34.name=Nyttårsaften
+holiday.nb-NO34.date=2013-12-31
diff --git a/doc/rc/holidays.nl-NL.rc b/doc/rc/holidays.nl-NL.rc
index 9fc23ce33..0d9f3c61a 100644
--- a/doc/rc/holidays.nl-NL.rc
+++ b/doc/rc/holidays.nl-NL.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for the Netherlands
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/nl-NL/2012.json
+# http://holidata.net/nl-NL/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,67 +25,61 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
-
-calendar.holidays=sparse
-
-# 2011
-holiday.nieuwjaar.name=Nieuwjaar
-holiday.nieuwjaar.date=20110101
-holiday.goedevrijdag.name=Goede Vrijdag
-holiday.goedevrijdag.date=20110422
-holiday.pasen.name=Pasen
-holiday.pasen.date=20110424
-holiday.pasen.name=Tweede Paasdag
-holiday.pasen.date=20100425
-holiday.koninginnedag.name=Koninginnedag
-holiday.koninginnedag.date=20110430
-holiday.dodenherdenking.name=Dodenherdenking
-holiday.dodenherdenking.date=20110504
-holiday.bevrijdingsdag.name=Bevrijdingsdag
-holiday.bevrijdingsdag.date=20110505
-holiday.hemelvaartsdag.name=Hemelvaartsdag
-holiday.hemelvaartsdag.date=20110602
-holiday.pinksteren.name= Pinksteren
-holiday.pinksteren.date=20110612
-holiday.pinksteren.name=Tweede Pinksterdag
-holiday.pinksteren.date=20110613
-holiday.sinterklaas.name=Sinterklaas
-holiday.sinterklaas.date=20111205
-holiday.koninkrijksdag.name=Koninkrijksdag
-holiday.koninkrijksdag.date=20111215
-holiday.kerstmis.name=Kerstmis
-holiday.kerstmis.date=20111225
-holiday.kerstmis.name=Tweede Kerstdag
-holiday.kerstmis.date=20111226
-
-# 2012
-#holiday.nieuwjaar.name=Nieuwjaar
-#holiday.nieuwjaar.date=20120101
-#holiday.goedevrijdag.name=Goede Vrijdag
-#holiday.goedevrijdag.date=20120406
-#holiday.pasen.name=Pasen
-#holiday.pasen.date=20120408
-#holiday.pasen.name=Tweede Pasdag
-#holiday.pasen.date=20120409
-#holiday.koninginnedag.name=Koninginnedag
-#holiday.koninginnedag.date=20120430
-#holiday.dodenherdenking.name=Dodenherdenking
-#holiday.dodenherdenking.date=20120504
-#holiday.bevrijdingsdag.name=Bevrijdingsdag
-#holiday.bevrijdingsdag.date=20120505
-#holiday.hemelvaartsdag.name=Hemelvaartsdag
-#holiday.hemelvaartsdag.date=20120617
-#holiday.pinksteren.name= Pinksteren
-#holiday.pinksteren.date=20120627
-#holiday.pinksteren.name=Tweede Pinksterdag
-#holiday.pinksteren.date=20120628
-#holiday.sinterklaas.name=Sinterklaas
-#holiday.sinterklaas.date=20121205
-#holiday.koninkrijksdag.name=Koninkrijksdag
-#holiday.koninkrijksdag.date=20121215
-#holiday.kerstmis.name=Kerstmis
-#holiday.kerstmis.date=20121225
-#holiday.kerstmis.name=Tweede Kerstdag
-#holiday.kerstmis.date=20121226
+###############################################################################
 
+holiday.nl-NL1.name=Nieuwjaar
+holiday.nl-NL1.date=2012-01-01
+holiday.nl-NL2.name=Goede Vrijdag
+holiday.nl-NL2.date=2012-04-06
+holiday.nl-NL3.name=Pasen
+holiday.nl-NL3.date=2012-04-08
+holiday.nl-NL4.name=Tweede Pasdag
+holiday.nl-NL4.date=2012-04-09
+holiday.nl-NL5.name=Koninginnedag
+holiday.nl-NL5.date=2012-04-30
+holiday.nl-NL6.name=Dodenherdenking
+holiday.nl-NL6.date=2012-05-04
+holiday.nl-NL7.name=Bevrijdingsdag
+holiday.nl-NL7.date=2012-05-05
+holiday.nl-NL8.name=Hemelvaartsdag
+holiday.nl-NL8.date=2012-05-17
+holiday.nl-NL9.name=Pinksteren
+holiday.nl-NL9.date=2012-05-27
+holiday.nl-NL10.name=Tweede Pinksterdag
+holiday.nl-NL10.date=2012-05-28
+holiday.nl-NL11.name=Sinterklaas
+holiday.nl-NL11.date=2012-12-05
+holiday.nl-NL12.name=Koninkrijksdag
+holiday.nl-NL12.date=2012-12-15
+holiday.nl-NL13.name=Kerstmis
+holiday.nl-NL13.date=2012-12-25
+holiday.nl-NL14.name=Tweede Kerstdag
+holiday.nl-NL14.date=2012-12-26
+holiday.nl-NL15.name=Nieuwjaar
+holiday.nl-NL15.date=2013-01-01
+holiday.nl-NL16.name=Goede Vrijdag
+holiday.nl-NL16.date=2013-03-29
+holiday.nl-NL17.name=Pasen
+holiday.nl-NL17.date=2013-03-31
+holiday.nl-NL18.name=Tweede Pasdag
+holiday.nl-NL18.date=2013-04-01
+holiday.nl-NL19.name=Koninginnedag
+holiday.nl-NL19.date=2013-04-30
+holiday.nl-NL20.name=Dodenherdenking
+holiday.nl-NL20.date=2013-05-04
+holiday.nl-NL21.name=Bevrijdingsdag
+holiday.nl-NL21.date=2013-05-05
+holiday.nl-NL22.name=Hemelvaartsdag
+holiday.nl-NL22.date=2013-05-09
+holiday.nl-NL23.name=Pinksteren
+holiday.nl-NL23.date=2013-05-19
+holiday.nl-NL24.name=Tweede Pinksterdag
+holiday.nl-NL24.date=2013-05-20
+holiday.nl-NL25.name=Sinterklaas
+holiday.nl-NL25.date=2013-12-05
+holiday.nl-NL26.name=Koninkrijksdag
+holiday.nl-NL26.date=2013-12-15
+holiday.nl-NL27.name=Kerstmis
+holiday.nl-NL27.date=2013-12-25
+holiday.nl-NL28.name=Tweede Kerstdag
+holiday.nl-NL28.date=2013-12-26
diff --git a/doc/rc/holidays.sv-SE.rc b/doc/rc/holidays.sv-SE.rc
index 6079c3f94..feeed7ff1 100644
--- a/doc/rc/holidays.sv-SE.rc
+++ b/doc/rc/holidays.sv-SE.rc
@@ -1,7 +1,7 @@
-################################################################################
-# Sample calendar for Sweden
-#
-# taskwarrior - a command line task list manager.
+###############################################################################
+# International Holiday Data provided by Holidata.net
+# http://holidata.net/sv-SE/2012.json
+# http://holidata.net/sv-SE/2013.json
 #
 # Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
 #
@@ -25,42 +25,73 @@
 #
 # http://www.opensource.org/licenses/mit-license.php
 #
-################################################################################
+###############################################################################
 
-calendar.holidays=sparse
-
-# 2011
-holiday.nyårsdagen.name=Nyårsdagen
-holiday.nyårsdagen.date=20110101
-holiday.trettondedagjul.name=Trettondedag jul
-holiday.trettondedagjul.date=20110106
-holiday.långfredagen.name=Långfredagen
-holiday.långfredagen.date=20110422
-holiday.påskdagen.name=Påskdagen
-holiday.påskdagen.date=20110424
-holiday.annandagpåsk.name=Annandag påsk
-holiday.annandagpåsk.date=20110425
-holiday.valborgmässoafton.name=Valborgmässoafton
-holiday.valborgmässoafton.date=20110430
-holiday.förstamaj.name=Första maj
-holiday.förstamaj.date=20110501
-holiday.kristihimmelfärdsdag.name=Kristi Himmelsfärdsdag
-holiday.kristihimmelfärdsdag.date=20110602
-holiday.nationaldagen.name=Nationaldagen
-holiday.nationaldagen.date=20110606
-holiday.pingstdagen.name=Pingstdagen
-holiday.pingstdagen.date=20110612
-holiday.midsommarafton.name=Midsommarafton
-holiday.midsommarafton.date=20110624
-holiday.midsommardagen.name=Midsommardagen
-holiday.midsommardagen.date=20110625
-holiday.allahelgonsdag.name=Alla Helgons Dag
-holiday.allahelgonsdag.date=20111105
-holiday.julafton.name=Julafton
-holiday.julafton.date=20111224
-holiday.juldagen.name=Juldagen
-holiday.juldagen.date=20111225
-holiday.annandagjul.name=Annandag jul
-holiday.annandagjul.date=20111226
-holiday.nyårsafton.name=Nyårsafton
-holiday.nyårsafton.date=20111231
+holiday.sv-SE1.name=Nyårsdagen
+holiday.sv-SE1.date=2012-01-01
+holiday.sv-SE2.name=Trettondedag jul
+holiday.sv-SE2.date=2012-01-06
+holiday.sv-SE3.name=Långfredagen
+holiday.sv-SE3.date=2012-04-06
+holiday.sv-SE4.name=Påskdagen
+holiday.sv-SE4.date=2012-04-08
+holiday.sv-SE5.name=Annandag påsk
+holiday.sv-SE5.date=2012-04-09
+holiday.sv-SE6.name=Valborgmässoafton
+holiday.sv-SE6.date=2012-04-30
+holiday.sv-SE7.name=Första maj
+holiday.sv-SE7.date=2012-05-01
+holiday.sv-SE8.name=Kristi Himmelsfärdsdag
+holiday.sv-SE8.date=2012-05-17
+holiday.sv-SE9.name=Pingstdagen
+holiday.sv-SE9.date=2012-05-27
+holiday.sv-SE10.name=Nationaldagen
+holiday.sv-SE10.date=2012-06-06
+holiday.sv-SE11.name=Midsommarafton
+holiday.sv-SE11.date=2012-06-22
+holiday.sv-SE12.name=Midsommardagen
+holiday.sv-SE12.date=2012-06-23
+holiday.sv-SE13.name=Alla Helgons Dag
+holiday.sv-SE13.date=2012-11-03
+holiday.sv-SE14.name=Julafton
+holiday.sv-SE14.date=2012-12-24
+holiday.sv-SE15.name=Juldagen
+holiday.sv-SE15.date=2012-12-25
+holiday.sv-SE16.name=Annandag jul
+holiday.sv-SE16.date=2012-12-26
+holiday.sv-SE17.name=Nyårsafton
+holiday.sv-SE17.date=2012-12-31
+holiday.sv-SE18.name=Nyårsdagen
+holiday.sv-SE18.date=2013-01-01
+holiday.sv-SE19.name=Trettondedag jul
+holiday.sv-SE19.date=2013-01-06
+holiday.sv-SE20.name=Långfredagen
+holiday.sv-SE20.date=2013-03-29
+holiday.sv-SE21.name=Påskdagen
+holiday.sv-SE21.date=2013-03-31
+holiday.sv-SE22.name=Annandag påsk
+holiday.sv-SE22.date=2013-04-01
+holiday.sv-SE23.name=Valborgmässoafton
+holiday.sv-SE23.date=2013-04-30
+holiday.sv-SE24.name=Första maj
+holiday.sv-SE24.date=2013-05-01
+holiday.sv-SE25.name=Kristi Himmelsfärdsdag
+holiday.sv-SE25.date=2013-05-09
+holiday.sv-SE26.name=Pingstdagen
+holiday.sv-SE26.date=2013-05-19
+holiday.sv-SE27.name=Nationaldagen
+holiday.sv-SE27.date=2013-06-06
+holiday.sv-SE28.name=Midsommarafton
+holiday.sv-SE28.date=2013-06-21
+holiday.sv-SE29.name=Midsommardagen
+holiday.sv-SE29.date=2013-06-22
+holiday.sv-SE30.name=Alla Helgons Dag
+holiday.sv-SE30.date=2013-11-02
+holiday.sv-SE31.name=Julafton
+holiday.sv-SE31.date=2013-12-24
+holiday.sv-SE32.name=Juldagen
+holiday.sv-SE32.date=2013-12-25
+holiday.sv-SE33.name=Annandag jul
+holiday.sv-SE33.date=2013-12-26
+holiday.sv-SE34.name=Nyårsafton
+holiday.sv-SE34.date=2013-12-31
diff --git a/doc/rc/refresh b/doc/rc/refresh
new file mode 100755
index 000000000..361dc85fa
--- /dev/null
+++ b/doc/rc/refresh
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+for i in holidays*rc
+do
+  locale=${i:9:5}
+  echo $locale
+  ../../scripts/add-ons/update-holidays.pl --locale $locale --file holidays.${locale}.rc
+done
+
diff --git a/scripts/add-ons/update-holidays.pl b/scripts/add-ons/update-holidays.pl
index b574c1106..b9385c7c1 100755
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@@ -180,10 +180,35 @@ for my $holiday (split /\n/ms, $data)
 if (open my $fh, '>:utf8', $file)
 {
   print $fh
+        "###############################################################################\n",
         "# International Holiday Data provided by Holidata.net\n",
-        "#\n",
         "# ${url_current}\n",
+        "# ${url_next}\n",
         "#\n",
+        "# Copyright 2006-2012, Paul Beckingham, Federico Hernandez.\n",
+        "#\n",
+        "# Permission is hereby granted, free of charge, to any person obtaining a copy\n",
+        "# of this software and associated documentation files (the \"Software\"), to deal\n",
+        "# in the Software without restriction, including without limitation the rights\n",
+        "# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n",
+        "# copies of the Software, and to permit persons to whom the Software is\n",
+        "# furnished to do so, subject to the following conditions:\n",
+        "#\n",
+        "# The above copyright notice and this permission notice shall be included\n",
+        "# in all copies or substantial portions of the Software.\n",
+        "#\n",
+        "# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n",
+        "# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n",
+        "# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n",
+        "# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n",
+        "# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n",
+        "# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n",
+        "# SOFTWARE.\n",
+        "#\n",
+        "# http://www.opensource.org/licenses/mit-license.php\n",
+        "#\n",
+        "###############################################################################\n",
+        "\n",
         $content;
 
   close $fh;