diff --git a/app/src/main/assets/japan.ics b/app/src/main/assets/japan.ics
index 0adaf3952..3418a5245 100644
--- a/app/src/main/assets/japan.ics
+++ b/app/src/main/assets/japan.ics
@@ -70,12 +70,13 @@ SUMMARY:海の日 / Umi no hi / Marine Day
 RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=3MO
 DTSTART;VALUE=DATE:20070716
 DTEND;VALUE=DATE:20070717
+EXDATE:20200720,20210719
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
 UID:jap_10
 SUMMARY:体育の日 / Taiiku no hi / Health-Sports Day
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=2MO
+RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=2MO;UNTIL=20191231
 DTSTART;VALUE=DATE:20071008
 DTEND;VALUE=DATE:20071009
 END:VEVENT
@@ -99,7 +100,7 @@ BEGIN:VEVENT
 STATUS:CONFIRMED
 UID:jap_13
 SUMMARY:天皇誕生日 / Tennō tanjōbi / Emperor Akihito's Birthday
-RRULE:FREQ=YEARLY;INTERVAL=1
+RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20190430
 DTSTART;VALUE=DATE:20071223
 DTEND;VALUE=DATE:20071224
 END:VEVENT
@@ -370,6 +371,7 @@ SUMMARY:山の日 / Yama no hi / Mountain Day
 RRULE:FREQ=YEARLY;INTERVAL=1
 DTSTART;VALUE=DATE:20160811
 DTEND;VALUE=DATE:20160812
+EXDATE:20200811,20210811
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
@@ -378,4 +380,105 @@ SUMMARY:振替休日 / Furikae kyūjitsu / Substitute Holiday
 DTSTART;VALUE=DATE:20190812
 DTEND;VALUE=DATE:20190813
 END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_52
+SUMMARY:振替休日 / Furikae kyūjitsu / Substitute Holiday
+DTSTART;VALUE=DATE:20200224
+DTEND;VALUE=DATE:20200225
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_53
+SUMMARY:振替休日 / Furikae kyūjitsu / Substitute Holiday
+DTSTART;VALUE=DATE:20210809
+DTEND;VALUE=DATE:20210810
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_54
+SUMMARY:国民の休日 / Kokumin no kyūjitsu / National Holiday
+DTSTART;VALUE=DATE:20190430
+DTEND;VALUE=DATE:20190501
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_55
+SUMMARY:国民の休日 / Kokumin no kyūjitsu / National Holiday
+DTSTART;VALUE=DATE:20190502
+DTEND;VALUE=DATE:20190503
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_56
+SUMMARY:即位礼正殿の儀 / Sokuireiseiden no gi
+DTSTART;VALUE=DATE:20191022
+DTEND;VALUE=DATE:20191023
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_57
+SUMMARY:即位の日 / Sokui no hi / Emperor Naruhito's Enthronement Day
+DTSTART;VALUE=DATE:20190501
+DTEND;VALUE=DATE:20190502
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_58
+SUMMARY:天皇誕生日 / Tennō tanjōbi / Emperor Naruhito's Birthday
+RRULE:FREQ=YEARLY;INTERVAL=1
+DTSTART;VALUE=DATE:20200223
+DTEND;VALUE=DATE:20200224
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_59
+SUMMARY:海の日 / Umi no hi / Marine Day
+DTSTART;VALUE=DATE:20200723
+DTEND;VALUE=DATE:20200724
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_60
+SUMMARY:海の日 / Umi no hi / Marine Day
+DTSTART;VALUE=DATE:20210722
+DTEND;VALUE=DATE:20210723
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_61
+SUMMARY:山の日 / Yama no hi / Mountain Day
+DTSTART;VALUE=DATE:20200810
+DTEND;VALUE=DATE:20200811
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_62
+SUMMARY:山の日 / Yama no hi / Mountain Day
+DTSTART;VALUE=DATE:20210808
+DTEND;VALUE=DATE:20210809
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_63
+SUMMARY:スポーツの日 / Supōtu o hi / Sports Day
+RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=2MO
+DTSTART;VALUE=DATE:20201012
+DTEND;VALUE=DATE:20201013
+EXDATE:20201012,20211011
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_64
+SUMMARY:スポーツの日 / Supōtu o hi / Sports Day
+DTSTART;VALUE=DATE:20200724
+DTEND;VALUE=DATE:20200725
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:jap_65
+SUMMARY:スポーツの日 / Supōtu o hi / Sports Day
+DTSTART;VALUE=DATE:20210723
+DTEND;VALUE=DATE:20210724
+END:VEVENT
 END:VCALENDAR