diff --git a/media/caldata/SpanishHolidays.ics b/media/caldata/SpanishHolidays.ics
index d46b1012ba8..fe629bee464 100644
--- a/media/caldata/SpanishHolidays.ics
+++ b/media/caldata/SpanishHolidays.ics
@@ -1,8 +1,6 @@
 BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
 VERSION:2.0
-X-WR-CALNAME:SpanishHolidays
-X-WR-TIMEZONE:Europe/Madrid
 BEGIN:VTIMEZONE
 TZID:Europe/Madrid
 X-LIC-LOCATION:Europe/Madrid
@@ -2149,4 +2147,258 @@ TRANSP:TRANSPARENT
 SEQUENCE:1
 X-MOZ-GENERATION:1
 END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T204847Z
+LAST-MODIFIED:20141220T191558Z
+DTSTAMP:20141220T191558Z
+UID:7fb1ad3b-c759-48a4-9826-e20ac0aa8d16
+SUMMARY:Día de Andalucía
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150228
+DTEND;VALUE=DATE:20150301
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205015Z
+LAST-MODIFIED:20141220T191729Z
+DTSTAMP:20141220T191729Z
+UID:e85a1127-f365-486d-844e-52a10d98c2ec
+SUMMARY:Día de San José (Valencia\, Madrid\, Murcia\, Navarra\, País Va
+ sco y Melilla)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150319
+DTEND;VALUE=DATE:20150320
+TRANSP:TRANSPARENT
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20141220T191759Z
+LAST-MODIFIED:20141220T191829Z
+DTSTAMP:20141220T191829Z
+UID:36f78fd5-0385-417b-b175-694c94b7b55a
+SUMMARY:Día siguiente a San José (Galicia)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150320
+DTEND;VALUE=DATE:20150321
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205207Z
+LAST-MODIFIED:20141220T191958Z
+DTSTAMP:20141220T191958Z
+UID:598c8969-9b87-475a-aa8a-5cf6b904452e
+SUMMARY:Jueves Santo (excepto Cataluña y Valencia)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150402
+DTEND;VALUE=DATE:20150403
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205241Z
+LAST-MODIFIED:20141220T191958Z
+DTSTAMP:20141220T191958Z
+UID:695c8c19-c85c-4b31-aa64-f22a34b46291
+SUMMARY:Viernes Santo
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150403
+DTEND;VALUE=DATE:20150404
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205306Z
+LAST-MODIFIED:20141220T192125Z
+DTSTAMP:20141220T192125Z
+UID:df68201a-8e95-439c-8b18-9a9f41531b56
+SUMMARY:Lunes de Pascua (Baleares\, Cantabria\, Castilla-La Mancha\, Catal
+ uña\, Valencia\, Navarra\, País Vasco y La Rioja)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150406
+DTEND;VALUE=DATE:20150407
+TRANSP:TRANSPARENT
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205404Z
+LAST-MODIFIED:20141220T192208Z
+DTSTAMP:20141220T192208Z
+UID:e9058656-9823-4fd6-b566-bb0ccf62e7bb
+SUMMARY:San Jorge (Aragón) / Fiesta de la Comunidad (Castilla y León)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150423
+DTEND;VALUE=DATE:20150424
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205515Z
+LAST-MODIFIED:20141220T192223Z
+DTSTAMP:20141220T192223Z
+UID:e165739b-6179-4600-b9cc-3e0754ee0922
+SUMMARY:Fiesta de la Comunidad (Madrid)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150502
+DTEND;VALUE=DATE:20150503
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205616Z
+LAST-MODIFIED:20141220T192332Z
+DTSTAMP:20141220T192332Z
+UID:02ccbd69-9ad7-4804-8545-2456be5ed067
+SUMMARY:Día de Canarias
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150530
+DTEND;VALUE=DATE:20150531
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205852Z
+LAST-MODIFIED:20141220T192500Z
+DTSTAMP:20141220T192500Z
+UID:62627074-a0ed-47da-83ec-91c34ee3f5fc
+SUMMARY:Día de la Región de Murcia / Día de La Rioja
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150609
+DTEND;VALUE=DATE:20150610
+TRANSP:TRANSPARENT
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T205956Z
+LAST-MODIFIED:20141220T192435Z
+DTSTAMP:20141220T192435Z
+UID:47f673d6-e393-4a9f-a2e9-7e682d70e675
+SUMMARY:Corpus Christi (Castilla-La Mancha y Madrid)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150604
+DTEND;VALUE=DATE:20150605
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210034Z
+LAST-MODIFIED:20141220T192332Z
+DTSTAMP:20141220T192332Z
+UID:f792ff7c-1a86-4d70-aa3a-1534f36aa16d
+SUMMARY:San Juan (Cataluña)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150624
+DTEND;VALUE=DATE:20150625
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210104Z
+LAST-MODIFIED:20141220T192645Z
+DTSTAMP:20141220T192645Z
+UID:2d1b0df5-6449-485f-a786-ca7ece2a6f02
+SUMMARY:Santiago Apostol (Galicia\, Navarra y País Vasco)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150724
+DTEND;VALUE=DATE:20150725
+TRANSP:TRANSPARENT
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210211Z
+LAST-MODIFIED:20141220T192825Z
+DTSTAMP:20141220T192825Z
+UID:d5adc34b-34d0-4db9-a048-626c2d233312
+SUMMARY:Día de Asturias / Día de Extremadura
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150908
+DTEND;VALUE=DATE:20150909
+TRANSP:TRANSPARENT
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210320Z
+LAST-MODIFIED:20141220T192825Z
+DTSTAMP:20141220T192825Z
+UID:2aa7a78e-c60f-4864-a334-5b0d84c4d9ef
+SUMMARY:Día nacional de Cataluña
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150911
+DTEND;VALUE=DATE:20150912
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210340Z
+LAST-MODIFIED:20141220T192825Z
+DTSTAMP:20141220T192825Z
+UID:7ecbb94e-74f9-4243-9ae3-ac38dfb15675
+SUMMARY:Festividad de la Bien Aparecida (Cantabria)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150915
+DTEND;VALUE=DATE:20150916
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210422Z
+LAST-MODIFIED:20141220T192950Z
+DTSTAMP:20141220T192950Z
+UID:9d2bf590-cd9d-44a8-8547-4aa7a94d339d
+SUMMARY:Festividad del Sacrificio (Melilla) / Festividad de la Pascua del 
+ Sacrificio (Ceuta)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20150925
+DTEND;VALUE=DATE:20150926
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210520Z
+LAST-MODIFIED:20141220T193043Z
+DTSTAMP:20141220T193043Z
+UID:b49e58c7-83e8-41c2-b99d-ed1a398f1eca
+SUMMARY:Día de la Comunidad Valenciana
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20151009
+DTEND;VALUE=DATE:20151010
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20141220T193105Z
+LAST-MODIFIED:20141220T193308Z
+DTSTAMP:20141220T193308Z
+UID:e21fedb7-f106-4138-a3c9-3e0eeb112ced
+SUMMARY:Lunes siguiente a Todos los Santos (Andalucía\, Aragón\, Asturia
+ s\, Baleares\, Canarias\, Cantabria\, Castilla y León\, Extremadura\, Gal
+ icia y Ceuta)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20151102
+DTEND;VALUE=DATE:20151103
+TRANSP:TRANSPARENT
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20141220T193342Z
+LAST-MODIFIED:20141220T194515Z
+DTSTAMP:20141220T194515Z
+UID:2d6617ac-3f8c-4ab1-9b18-56b5ea9ef5ed
+SUMMARY:Lunes siguiente al Día de la Constitución (excepto Canarias\, Ca
+ ntabria\, Cataluña\, Galicia\, Madrid\, Navarra y País Vasco)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20151207
+DTEND;VALUE=DATE:20151208
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20131223T210651Z
+LAST-MODIFIED:20141220T194057Z
+DTSTAMP:20141220T194057Z
+UID:8be84c02-a5cd-4a75-b5e0-61d902168a3a
+SUMMARY:San Esteban - Segunda Fiesta de Navidad (Cataluña)
+CATEGORIES:Fiestas oficiales
+DTSTART;VALUE=DATE:20151226
+DTEND;VALUE=DATE:20151227
+TRANSP:TRANSPARENT
+SEQUENCE:1
+X-MOZ-GENERATION:2
+END:VEVENT
 END:VCALENDAR
diff --git a/media/caldata/calendars.json b/media/caldata/calendars.json
index 2bcb7ad203f..facd72396c0 100644
--- a/media/caldata/calendars.json
+++ b/media/caldata/calendars.json
@@ -385,7 +385,7 @@
   {
     "country":"Spain",
     "filename":"SpanishHolidays.ics",
-    "datespan":"2007-2014",
+    "datespan":"2007-2015",
     "authors":"Ricardo Palomares"
   },
   {