diff --git a/src/plugins/holidays.xml b/src/plugins/holidays.xml
index 5c44ccf41..05e1884ba 100644
--- a/src/plugins/holidays.xml
+++ b/src/plugins/holidays.xml
@@ -2,7 +2,6 @@
 <calendar>
   <country name="Canada">
     <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="New Year's Eve" value="*/12/31" type="national" />
     <date name="Groundhog Day" value="*/2/2" type="secular" />
     <date name="Valentine's Day" value="*/2/14" type="secular" />
     <date name="Flag Day" value="*/2/15" type="secular" />
@@ -52,10 +51,12 @@
   </country>
   <country name="United States">
     <date name="New Year's Day" value="*/1/1" type="national" />
+    <date name="New Year's Eve" value="*/12/31" type="national" />
     <date name="Independence Day" value="*/7/4" type="national" />
     <date name="Veterans Day" value="*/11/11" type="national" />
     <date name="Christmas" value="*/12/25" type="national" />
-    <date name="Labor Day" value="*/1/mon/sep" type="national" />
+    <date name="Labor Day" value="*/1/mon/sep" if="y &lt;= 2008" type="national" />
+    <date name="Labor Day" value="2009/1/tue/sep" type="national" />
     <date name="Thanksgiving" value="*/4/thu/nov" type="national" />
     <date name="Inauguration Day" value="*/1/20" if="(y - 1980) % 4 == 1" type="national" />
     <date name="Groundhog Day" value="*/2/2" type="secular" />
@@ -101,8 +102,8 @@
     <date name="Yom Kippur" value="2006/10/02" type="religious" />
     <date name="Yom Kippur" value="2007/9/27" type="religious" />
     <date name="Yom Kippur" value="2008/10/09" type="religious" />
-    <date name="Yom Kippur" value="2009/9/28" type="religious" />
-    <date name="Yom Kippur" value="2010/9/18" type="religious" />
+    <date name="Yom Kippur" value="2009/09/28" type="religious" />
+    <date name="Yom Kippur" value="2010/09/18" type="religious" />
     <date name="Hanukkah begins" value="2004/12/07" type="religious" />
     <date name="Hanukkah begins" value="2005/12/25" type="religious" />
     <date name="Hanukkah begins" value="2006/12/15" type="religious" />
@@ -110,9 +111,10 @@
     <date name="Hanukkah begins" value="2008/12/21" type="religious" />
     <date name="Hanukkah begins" value="2009/12/11" type="religious" />
     <date name="Hanukkah begins" value="2010/12/01" type="religious" />
-    <date name="Ramadan begins" value="2006/9/24" type="religious" />
-    <date name="Ramadan begins" value="2007/9/13" type="religious" />
-    <date name="Ramadan begins" value="2008/9/2" type="religious" />
+    <date name="Ramadan begins" value="2006/09/24" type="religious" />
+    <date name="Ramadan begins" value="2007/09/13" type="religious" />
+    <date name="Ramadan begins" value="2008/09/2" type="religious" />
+    <date name="Ramadan begins" value="2009/08/22" type="religious" />
     <date name="Kwanzaa begins" value="*/12/26" type="religious" />
     <date name="Cinco de Mayo" value="*/5/5" type="secular" />
   </country>