Errata Patch for US Daylight Saving Time Change

Not sure where to post this one.  Any advice for future patches like
these would be welcomed.

Attached patches address a recent question on misc@ regarding patching
for the upcoming DST change in the United States.

Questions?  Concerns?  Feedback?

Jim
Index: errata.html
===================================================================
RCS file: /cvs/www/errata.html,v
retrieving revision 1.583
diff -u -r1.583 errata.html
--- errata.html	2007/01/16 06:28:44	1.583
+++ errata.html	2007/01/30 02:19:42
@@ -80,6 +80,15 @@
 
 <ul>
 
+<li><a name="northamerica"></a>
+<font color="#009000"><strong>009: RELIABILITY FIX: January 30, 2007</strong></font> &nbsp; <i>All architectures</i><br>
+Daylight Saving Time in the United States will be incorrectly reported
+beginning March 11, 2007.
+<br>
+<a href="ftp://ftp.openbsd.org/pub/OpenBSD/patches/4.0/common/009_northamerica.patch">
+A source code patch exists which remedies this problem</a>.<br>
+<p>
+
 <li><a name="icmp6"></a>
 <font color="#009000"><strong>008: RELIABILITY FIX: January 16, 2007</strong></font> &nbsp; <i>All architectures</i><br>
 Under some circumstances, processing an ICMP6 echo request would cause
This file contains a patch for OpenBSD 4.0 errata #9.

For more information about this errata, please refer to
  http://www.OpenBSD.org/errata.html#northamerica

This URL will change to http://www.OpenBSD.org/errata40.html#northamerica
once OpenBSD 4.1 is released around May 1st, 2007.

Apply this patch by doing:
	cd /usr/src
	patch -p0 < 009_northamerica.patch

And then build and install:
	cd share/zoneinfo
	make realinstall

Index: share/zoneinfo/datfiles/northamerica
===================================================================
RCS file: /cvs/src/share/zoneinfo/datfiles/northamerica,v
retrieving revision 1.21
diff -u -r1.21 northamerica
--- share/zoneinfo/datfiles/northamerica	2006/02/18 19:47:24	1.21
+++ share/zoneinfo/datfiles/northamerica	2007/01/29 23:56:19
@@ -125,18 +125,14 @@
 Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
 Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
 Rule	US	1945	only	-	Sep	30	2:00	0	S
-# The Energy Policy Act of 2005 changed the end month of DST from Oct to Nov
-Rule	US	1967	max	-	Oct	lastSun	2:00	0	S
-#Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
+Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
 Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
 Rule	US	1974	only	-	Jan	6	2:00	1:00	D
 Rule	US	1975	only	-	Feb	23	2:00	1:00	D
 Rule	US	1976	1986	-	Apr	lastSun	2:00	1:00	D
-# The Energy Policy Act of 2005 changed the start month of DST from Apr to Mar
-Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
-#Rule	US	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
-#Rule	US	2007	max	-	Mar	Sun>=8	2:00	1:00	D
-#Rule	US	2007	max	-	Nov	Sun>=1	2:00	0	S
+Rule	US	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+Rule	US	2007	max	-	Mar	Sun>=8	2:00	1:00	D
+Rule	US	2007	max	-	Nov	Sun>=1	2:00	0	S
 
 # From Arthur David Olson, 2005-12-19
 # We generate the files specified below to guard against old files with