diff --git a/ChangeLog b/ChangeLog
index 4bdd21a79..236caeb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-31  Blank  <dblank@cs.brynmawr.edu>
+	* src/plugins/Calendar.py: added capitalize() to months/days; dst()
+	* src/plugins/holidays.xml: uses dst() Daylight Saving Time function
+
 2007-10-31 Benny Malengier <benny.malengier@gramps-project.org>
 	* src/plugins/all_relations.py: use collapse family
 	* src/Relationship.py: add collopse equal family
diff --git a/src/plugins/Calendar.py b/src/plugins/Calendar.py
index 8a3a1ae44..971b907d6 100644
--- a/src/plugins/Calendar.py
+++ b/src/plugins/Calendar.py
@@ -27,6 +27,7 @@ __version__ = "$Revision$"
 from gettext import gettext as _
 from xml.parsers import expat
 import datetime
+import math
 import time
 import const
 import os
@@ -84,6 +85,23 @@ def g2iso(dow):
     # ISO: MON = 1
     return (dow + 5) % 7 + 1
 
+def dst(year, area="us"):
+    """
+    Returns Daylight Saving Time start/stop in a given area ("us", "eu").
+    US calculation valid 1976-2099; EU 1996-2099
+    """
+    if area == "us":
+        if year > 2006:
+            start = "%d/%d/%d" % (year, 3, 14 - (math.floor(1 + year * 5 / 4) % 7)) # March
+            stop = "%d/%d/%d" % (year, 11, 7 - (math.floor(1 + year * 5 / 4) % 7)) # November
+        else:
+            start = "%d/%d/%d" % (year, 4, (2 + 6 * year - math.floor(year / 4) ) % 7 + 1) # April
+            stop =  "%d/%d/%d" % (year, 10,(31 - (math.floor(year * 5 / 4) + 1) % 7)) # October
+    elif area == "eu":
+        start = "%d/%d/%d" % (year, 3,(31 - (math.floor(year * 5 / 4) + 4) % 7)) # March
+        stop =  "%d/%d/%d" % (year, 10,(31 - (math.floor(year * 5 / 4) + 1) % 7)) # Oct
+    return (start, stop)
+
 #------------------------------------------------------------------------
 #
 # Calendar
@@ -213,7 +231,7 @@ class Calendar(Report):
         self.doc.draw_box("CAL-Title", "", 0, 0, width, header)
         self.doc.draw_line("CAL-Border", 0, header, width, header)
         year = self.year
-        title = "%s %d" % (GrampsLocale.long_months[month], year)
+        title = "%s %d" % (GrampsLocale.long_months[month].capitalize(), year)
         font_height = pt2cm(ptitle.get_font().get_size())
         self.doc.center_text("CAL-Title", title, width/2, font_height * 0.25)
         cell_width = width / 7
@@ -232,7 +250,7 @@ class Calendar(Report):
             self.doc.center_text("CAL-Daynames", 
                                  GrampsLocale.long_days[(day_col+
                                                          g2iso(self.start_dow + 1))
-                                                        % 7 + 1],
+                                                        % 7 + 1].capitalize(),
                                  day_col * cell_width + cell_width/2,
                                  header - font_height * 1.5)
         for week_row in range(6):
@@ -404,7 +422,7 @@ class CalendarReport(Calendar):
         """ Prints a month as a page """
         year = self.year
         self.doc.start_paragraph('BIR-Monthstyle')
-        self.doc.write_text(GrampsLocale.long_months[month])
+        self.doc.write_text(GrampsLocale.long_months[month].capitalize())
         self.doc.end_paragraph()
         current_date = datetime.date(year, month, 1)
         current_ord = current_date.toordinal()
@@ -455,10 +473,10 @@ class CalendarOptions(MenuOptions):
         country.set_help(_("Select the country to see associated holidays"))
         menu.add_option(category_name,"country", country)
 
-        start_dow = EnumeratedListOption(_("First day of week"), GrampsLocale.long_days[1])
+        start_dow = EnumeratedListOption(_("First day of week"), GrampsLocale.long_days[1].capitalize())
         for count in range(1,8):
             # conversion between gramps numbering (sun=1) and iso numbering (mon=1) of weekdays below
-            start_dow.add_item((count+5) % 7 + 1, GrampsLocale.long_days[count]) 
+            start_dow.add_item((count+5) % 7 + 1, GrampsLocale.long_days[count].capitalize()) 
         start_dow.set_help(_("Select the first day of the week for the calendar"))
         menu.add_option(category_name, "start_dow", start_dow) 
 
diff --git a/src/plugins/holidays.xml b/src/plugins/holidays.xml
index 05d6d7be8..a25c72408 100644
--- a/src/plugins/holidays.xml
+++ b/src/plugins/holidays.xml
@@ -79,14 +79,14 @@
     <date name="Memorial Day" value="*/-1/mon/may" type="secular" />
     <date name="Flag Day" value="*/6/14" type="secular" />
     <date name="Election Day" value="*/11/2" offset="tue" type="secular" />
-    <date name="Daylight Savings begins" value="*/1/sun/apr" type="informational" />
+    <date name="Daylight Saving begins" value="> dst(y)[0]" type="informational" />
     <date name="Income Taxes due" value="*/4/15" type="national" 
      if="date.weekday().__cmp__(4)-1" />
     <date name="Income Taxes due" value="*/4/16" type="national" 
      if="date.weekday() == 0" />
     <date name="Income Taxes due" value="*/4/17" type="national" 
      if="date.weekday() == 0" />
-    <date name="Daylight Savings ends" value="*/-1/sun/oct" type="informational" />
+    <date name="Daylight Saving ends" value="> dst(y)[1]" type="informational" />
     <date name="Easter" type="religious" value="> easter(y)" />
     <date name="Ash Wednesday" type="religious" value="> easter(y)" offset="-46" />
     <date name="Passover" value="2005/4/24" type="religious" />