diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index 1c13ac16aeba063ac10259004c206598592fdd02..f940f7f0f32af65edcae17c71a7d67519405ff72 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -84,38 +84,38 @@ mapping zones =
 ([
    "America":   ({"Danmarkshavn","Scoresbysund","Godthab","Thule","New_York",
                   "Chicago","North_Dakota/Center","North_Dakota/New_Salem",   
-                  "Denver","Los_Angeles","Juneau","Yakutat","Anchorage",    
-                  "Nome","Adak","Phoenix","Boise","Indiana/Indianapolis",   
-                  "Indiana/Marengo","Indiana/Vincennes","Indiana/Tell_City",  
-                  "Indiana/Petersburg","Indiana/Knox","Indiana/Winamac",      
-                  "Indiana/Vevay","Kentucky/Louisville","Kentucky/Monticello",
-                  "Detroit","Menominee","St_Johns","Goose_Bay","Halifax",   
-                  "Glace_Bay","Moncton","Blanc-Sablon","Montreal","Toronto",
-                  "Thunder_Bay","Nipigon","Rainy_River","Atikokan",          
-                  "Winnipeg","Regina","Swift_Current","Edmonton","Vancouver",
-                  "Dawson_Creek","Pangnirtung","Iqaluit","Resolute",         
-                  "Rankin_Inlet","Cambridge_Bay","Yellowknife","Inuvik",     
-                  "Whitehorse","Dawson","Cancun","Merida","Matamoros",      
-                  "Monterrey","Mexico_City","Ojinaga","Chihuahua",           
-                  "Hermosillo","Mazatlan","Bahia_Banderas","Tijuana",        
-                  "Santa_Isabel","Anguilla","Antigua","Nassau","Barbados",  
-                  "Belize","Cayman","Costa_Rica","Havana","Dominica",       
-                  "Santo_Domingo","El_Salvador","Grenada","Guadeloupe",      
-                  "Guatemala","Port-au-Prince","Tegucigalpa","Jamaica",      
-                  "Martinique","Montserrat","Managua","Panama","Puerto_Rico",
-                  "St_Kitts","St_Lucia","Miquelon","St_Vincent","Grand_Turk",
-                  "Tortola","St_Thomas","Argentina/Buenos_Aires",             
-                  "Argentina/Cordoba","Argentina/Salta","Argentina/Tucuman",  
-                  "Argentina/La_Rioja","Argentina/San_Juan","Argentina/Jujuy",
-                  "Argentina/Catamarca","Argentina/Mendoza",   
-                  "Argentina/San_Luis","Argentina/Rio_Gallegos",               
-                  "Argentina/Ushuaia","Aruba","La_Paz","Noronha","Belem",   
-                  "Santarem","Fortaleza","Recife","Araguaina","Maceio",     
-                  "Bahia","Sao_Paulo","Campo_Grande","Cuiaba","Porto_Velho",
-                  "Boa_Vista","Manaus","Eirunepe","Rio_Branco","Santiago",  
-                  "Bogota","Curacao","Guayaquil","Cayenne","Guyana",        
-                  "Asuncion","Lima","Paramaribo","Port_of_Spain",            
-                  "Montevideo","Caracas"}),                    
+                  "North_Dakota/Beulah","Denver","Los_Angeles","Juneau",     
+                  "Yakutat","Anchorage","Nome","Adak","Phoenix","Boise",   
+                  "Indiana/Indianapolis","Indiana/Marengo","Indiana/Vincennes",
+                  "Indiana/Tell_City","Indiana/Petersburg","Indiana/Knox",    
+                  "Indiana/Winamac","Indiana/Vevay","Kentucky/Louisville",    
+                  "Kentucky/Monticello","Detroit","Menominee","St_Johns",    
+                  "Goose_Bay","Halifax","Glace_Bay","Moncton","Blanc-Sablon",
+                  "Montreal","Toronto","Thunder_Bay","Nipigon","Rainy_River",
+                  "Atikokan","Winnipeg","Regina","Swift_Current","Edmonton",
+                  "Vancouver","Dawson_Creek","Pangnirtung","Iqaluit",        
+                  "Resolute","Rankin_Inlet","Cambridge_Bay","Yellowknife",   
+                  "Inuvik","Whitehorse","Dawson","Cancun","Merida",         
+                  "Matamoros","Monterrey","Mexico_City","Ojinaga",           
+                  "Chihuahua","Hermosillo","Mazatlan","Bahia_Banderas",      
+                  "Tijuana","Santa_Isabel","Anguilla","Antigua","Nassau",   
+                  "Barbados","Belize","Cayman","Costa_Rica","Havana",       
+                  "Dominica","Santo_Domingo","El_Salvador","Grenada",        
+                  "Guadeloupe","Guatemala","Port-au-Prince","Tegucigalpa",   
+                  "Jamaica","Martinique","Montserrat","Managua","Panama",   
+                  "Puerto_Rico","St_Kitts","St_Lucia","Miquelon",            
+                  "St_Vincent","Grand_Turk","Tortola","St_Thomas",           
+                  "Argentina/Buenos_Aires","Argentina/Cordoba",
+                  "Argentina/Salta","Argentina/Tucuman","Argentina/La_Rioja", 
+                  "Argentina/San_Juan","Argentina/Jujuy","Argentina/Catamarca",
+                  "Argentina/Mendoza","Argentina/San_Luis",    
+                  "Argentina/Rio_Gallegos","Argentina/Ushuaia","Aruba",       
+                  "La_Paz","Noronha","Belem","Santarem","Fortaleza",        
+                  "Recife","Araguaina","Maceio","Bahia","Sao_Paulo",        
+                  "Campo_Grande","Cuiaba","Porto_Velho","Boa_Vista","Manaus",
+                  "Eirunepe","Rio_Branco","Santiago","Bogota","Curacao",    
+                  "Guayaquil","Cayenne","Guyana","Asuncion","Lima",         
+                  "Paramaribo","Port_of_Spain","Montevideo","Caracas"}),     
    "Pacific":   ({"Rarotonga","Fiji","Gambier","Marquesas","Tahiti","Guam",
                   "Tarawa","Enderbury","Kiritimati","Saipan","Majuro",      
                   "Kwajalein","Chuuk","Pohnpei","Kosrae","Nauru","Noumea", 
diff --git a/lib/modules/Calendar.pmod/tzdata/australasia b/lib/modules/Calendar.pmod/tzdata/australasia
index 2c8f7dbfe36c20d67c38944ad8613cb3257d02d4..57e8335517c02ebe1a5a07ad66fcc1bc9eabe810 100644
--- a/lib/modules/Calendar.pmod/tzdata/australasia
+++ b/lib/modules/Calendar.pmod/tzdata/australasia
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.20
+# @(#)australasia	8.22
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -84,14 +84,13 @@ Rule	AS	1986	only	-	Oct	19	2:00s	1:00	-
 Rule	AS	1987	2007	-	Oct	lastSun	2:00s	1:00	-
 Rule	AS	1972	only	-	Feb	27	2:00s	0	-
 Rule	AS	1973	1985	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1986	1989	-	Mar	Sun>=15	2:00s	0	-
-Rule	AS	1990	only	-	Mar	Sun>=18	2:00s	0	-
-Rule	AS	1991	only	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1992	only	-	Mar	Sun>=18	2:00s	0	-
-Rule	AS	1993	only	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1994	only	-	Mar	Sun>=18	2:00s	0	-
+Rule	AS	1986	1990	-	Mar	Sun>=15	2:00s	0	-
+Rule	AS	1991	only	-	Mar	3	2:00s	0	-
+Rule	AS	1992	only	-	Mar	22	2:00s	0	-
+Rule	AS	1993	only	-	Mar	7	2:00s	0	-
+Rule	AS	1994	only	-	Mar	20	2:00s	0	-
 Rule	AS	1995	2005	-	Mar	lastSun	2:00s	0	-
-Rule	AS	2006	only	-	Apr	Sun>=1	2:00s	0	-
+Rule	AS	2006	only	-	Apr	2	2:00s	0	-
 Rule	AS	2007	only	-	Mar	lastSun	2:00s	0	-
 Rule	AS	2008	max	-	Apr	Sun>=1	2:00s	0	-
 Rule	AS	2008	max	-	Oct	Sun>=1	2:00s	1:00	-
diff --git a/lib/modules/Calendar.pmod/tzdata/northamerica b/lib/modules/Calendar.pmod/tzdata/northamerica
index 7dfd064f23ff213d7a3024d64e265d8f6f7b88af..39e1380dab38ec779744521fef02fbff0b1f69f2 100644
--- a/lib/modules/Calendar.pmod/tzdata/northamerica
+++ b/lib/modules/Calendar.pmod/tzdata/northamerica
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.34
+# @(#)northamerica	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -346,6 +346,27 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
 			-7:00	US	M%sT	2003 Oct 26 02:00
 			-6:00	US	C%sT
 
+# From Josh Findley (2011-01-21):
+# ...it appears that Mercer County, North Dakota, changed from the
+# mountain time zone to the central time zone at the last transition from
+# daylight-saving to standard time (on Nov. 7, 2010):
+# <a href="http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm">
+# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
+# </a>
+# <a href="http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html">
+# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html
+# </a>
+
+# From Andy Lipscomb (2011-01-24):
+# ...according to the Census Bureau, the largest city is Beulah (although
+# it's commonly referred to as Beulah-Hazen, with Hazen being the next
+# largest city in Mercer County).  Google Maps places Beulah's city hall
+# at 4715'51" north, 10146'40" west, which yields an offset of 6h47'07".
+
+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
+			-7:00	US	M%sT	2010 Nov  7 2:00
+			-6:00	US	C%sT
+
 # US mountain time, represented by Denver
 #
 # Colorado, far western Kansas, Montana, western
@@ -471,20 +492,50 @@ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
 #  three votes for and one against."
 
 # Hawaii
-#
-# From Arthur David Olson:
-# And then there's Hawaii.
-# DST was observed for one day in 1933;
-# standard time was changed by half an hour in 1947;
-# it's always standard as of 1986.
-#
-# From Paul Eggert:
-# Shanks says the 1933 experiment lasted for three weeks.  Go with Shanks.
-#
-Zone Pacific/Honolulu	-10:31:26 -	LMT	1900 Jan  1 12:00
-			-10:30	-	HST	1933 Apr 30 2:00
-			-10:30	1:00	HDT	1933 May 21 2:00
-			-10:30	US	H%sT	1947 Jun  8 2:00
+
+# From Arthur David Olson (2010-12-09):
+# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
+# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
+# the article is available at
+# <a href="http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf">
+# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
+# </a>
+# and indicates that standard time was adopted effective noon, January
+# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
+# saving for the period between the last Sunday of each April and the
+# last Sunday of each September, but less than a month later repealed the
+# act," (page 220), that year-round daylight saving time was in effect
+# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for
+# when clocks changed) and that clocks were changed by 30 minutes
+# effective the second Sunday of June, 1947 (page 219, with no time of
+# day given for when clocks changed). A footnote for the 1933 changes
+# cites Session Laws of Hawaii 1933, "Act. 90 (approved 26 Apr. 1933)
+# and Act 163 (approved 21 May 1933)."
+
+# From Arthur David Olson (2011-01-19):
+# The following is from "Laws of the Territory of Hawaii Passed by the
+# Seventeenth Legislature: Regular Session 1933," available (as of
+# 2011-01-19) at American University's Pence Law Library. Page 85: "Act
+# 90...At 2 o'clock ante meridian of the last Sunday in April of each
+# year, the standard time of this Territory shall be advanced one
+# hour...This Act shall take effect upon its approval. Approved this 26th
+# day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
+# Hawaii." Page 172:  "Act 163...Act 90 of the Session Laws of 1933 is
+# hereby repealed...This Act shall take effect upon its approval, upon
+# which date the standard time of this Territory shall be restored to
+# that existing immediately prior to the taking effect of said Act 90.
+# Approved this 21st day of May, A. D. 1933. LAWRENCE M. JUDD, Governor
+# of the Territory of Hawaii."
+#
+# Note that 1933-05-21 was a Sunday.
+# We're left to guess the time of day when Act 163 was approved; guess noon.
+
+Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
+			-10:30	-	HST	1933 Apr 30 2:00 #Laws 1933
+			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
+			-10:30	-	HST	1942 Feb 09 2:00 #Schmitt&Cox+2
+			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Fox+2
+			-10:30	US	H%sT	1947 Jun  8 2:00 #Schmitt&Fox+2
 			-10:00	-	HST
 
 # Now we turn to US areas that have diverged from the consensus since 1970.
diff --git a/lib/modules/Calendar.pmod/tzdata/zone.tab b/lib/modules/Calendar.pmod/tzdata/zone.tab
index 2bdf92307776fde1ece6e57ada084067bc40f18c..e2b8b1c1d8536d43ffe5fc786715aa431314e97b 100644
--- a/lib/modules/Calendar.pmod/tzdata/zone.tab
+++ b/lib/modules/Calendar.pmod/tzdata/zone.tab
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.38
+# @(#)zone.tab	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -211,8 +211,8 @@ HT	+1832-07220	America/Port-au-Prince
 HU	+4730+01905	Europe/Budapest
 ID	-0610+10648	Asia/Jakarta	Java & Sumatra
 ID	-0002+10920	Asia/Pontianak	west & central Borneo
-ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
-ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
 IL	+3146+03514	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
@@ -404,6 +404,7 @@ US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
 US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
 US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
 US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
 US	+394421-1045903	America/Denver	Mountain Time
 US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
 US	+364708-1084111	America/Shiprock	Mountain Time - Navajo