diff --git a/src/plugins/lib/holidays.xml b/src/plugins/lib/holidays.xml
index 4c13ced95..be2bc63cf 100644
--- a/src/plugins/lib/holidays.xml
+++ b/src/plugins/lib/holidays.xml
@@ -410,8 +410,10 @@
     <date name="Annandag Påsk" type="religious" value="> easter(y)" offset="2" />
     <date name="Första Maj" value="*/5/1" type="secular" />
     <date name="Kristi Himmelfärdsdag" type="religious" value="> easter(y)" offset="+39" />
-    <date name="Nationaldag" value="*/6/6" type="secular" />
-    <date name="Midsommardagen" value="*/jun/20" offset="sat" type="religious" />
+    <date name="Annandag Pingst" value="easter(y)" offset="50" type="secular" if="not(y>=2006)" />
+    <date name="Nationaldagen" value="*/6/6" type="secular" if="(y>=2006)" />
+    <date name="Midsommardagen" value="*/jun/20" offset="sat" type="religious" if="(y>=1953)" />
+    <date name="Midsommardagen" value="*/jun/24" type="religious" if="not(y>=1953)"  />
     <date name="Allahelgonadagen" value="*/1/sat/nov" type="religious" />
     <date name="Juldagen" value="*/12/25" type="religious" />
     <date name="Annandag Jul" value="*/12/26" type="religious" />