diff --git a/lib/modules/Calendar.pmod/TZnames.pmod b/lib/modules/Calendar.pmod/TZnames.pmod
index 8d83c1efcb96d008eaf4d59d730bbc8d883c4737..7d885594a50c327c8d93d620ed0c8e72df5d120f 100644
--- a/lib/modules/Calendar.pmod/TZnames.pmod
+++ b/lib/modules/Calendar.pmod/TZnames.pmod
@@ -266,10 +266,9 @@ mapping abbr2zones =
"America/Curacao", "America/Glace_Bay", "America/Goose_Bay",
"America/Halifax", "America/Martinique", "America/Moncton",
"America/Port_of_Spain", "America/Puerto_Rico",
- "America/Santo_Domingo", "America/Thule", "Asia/Aden", "Asia/Amman",
- "Asia/Baghdad", "Asia/Bahrain", "Asia/Kuwait", "Asia/Qatar",
- "Asia/Riyadh", "Atlantic/Bermuda", "America/Miquelon",
- "America/Pangnirtung"}),
+ "America/Santo_Domingo", "America/Thule", "Asia/Aden", "Asia/Baghdad",
+ "Asia/Bahrain", "Asia/Kuwait", "Asia/Qatar", "Asia/Riyadh",
+ "Atlantic/Bermuda", "America/Miquelon", "America/Pangnirtung"}),
"AWT": ({"America/Glace_Bay", "America/Goose_Bay", "America/Halifax",
"America/Moncton", "Atlantic/Bermuda", "America/Blanc-Sablon",
"America/Pangnirtung", "America/Puerto_Rico"}),
@@ -461,20 +460,21 @@ mapping abbr2zones =
"America/Jamaica", "America/Santo_Domingo"}),
"EEMT": ({"Europe/Kaliningrad", "Europe/Minsk", "Europe/Moscow",
"Europe/Chisinau"}),
- "EEST": ({"Africa/Cairo", "Asia/Beirut", "Asia/Damascus", "Asia/Gaza",
- "Asia/Hebron", "Asia/Nicosia", "EET", "Europe/Athens",
- "Europe/Bucharest", "Europe/Chisinau", "Europe/Helsinki",
- "Europe/Istanbul", "Europe/Kiev", "Europe/Riga", "Europe/Simferopol",
- "Europe/Sofia", "Europe/Tallinn", "Europe/Uzhgorod", "Europe/Vilnius",
- "Europe/Zaporozhye", "Asia/Amman", "Europe/Kaliningrad",
- "Europe/Minsk", "Europe/Moscow", "Europe/Warsaw"}),
- "EET": ({"Africa/Cairo", "Africa/Tripoli", "Asia/Beirut", "Asia/Damascus",
+ "EEST": ({"Africa/Cairo", "Asia/Amman", "Asia/Beirut", "Asia/Damascus",
"Asia/Gaza", "Asia/Hebron", "Asia/Nicosia", "EET", "Europe/Athens",
"Europe/Bucharest", "Europe/Chisinau", "Europe/Helsinki",
"Europe/Istanbul", "Europe/Kiev", "Europe/Riga", "Europe/Simferopol",
"Europe/Sofia", "Europe/Tallinn", "Europe/Uzhgorod", "Europe/Vilnius",
- "Europe/Zaporozhye", "Asia/Amman", "Europe/Kaliningrad",
- "Europe/Minsk", "Europe/Moscow", "Europe/Warsaw"}),
+ "Europe/Zaporozhye", "Europe/Kaliningrad", "Europe/Minsk",
+ "Europe/Moscow", "Europe/Warsaw"}),
+ "EET": ({"Africa/Cairo", "Africa/Tripoli", "Asia/Amman", "Asia/Beirut",
+ "Asia/Damascus", "Asia/Gaza", "Asia/Hebron", "Asia/Nicosia", "EET",
+ "Europe/Athens", "Europe/Bucharest", "Europe/Chisinau",
+ "Europe/Helsinki", "Europe/Istanbul", "Europe/Kiev", "Europe/Riga",
+ "Europe/Simferopol", "Europe/Sofia", "Europe/Tallinn",
+ "Europe/Uzhgorod", "Europe/Vilnius", "Europe/Zaporozhye",
+ "Europe/Kaliningrad", "Europe/Minsk", "Europe/Moscow",
+ "Europe/Warsaw"}),
"EGST": ({"America/Scoresbysund"}),
"EGT": ({"America/Scoresbysund"}),
"EHDT": ({"America/Santo_Domingo"}),
diff --git a/lib/modules/Calendar.pmod/tzdata/asia b/lib/modules/Calendar.pmod/tzdata/asia
index 580a179776a00882a6791518683f5792a70d0526..2867e643c61c376c4f54ba457569cd674d636983 100644
--- a/lib/modules/Calendar.pmod/tzdata/asia
+++ b/lib/modules/Calendar.pmod/tzdata/asia
@@ -1380,12 +1380,22 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
# switch back to standard time this winter, so the will stay on DST
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
-#
-# From Paul Eggert (2013-09-21):
-# It's looking like this change will be permanent; see
-# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
-# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
-# So move Jordan to UTC+3 as of the abovementioned date.
+
+# From Steffen Thorsen (2013-12-11):
+# Jordan Times and other sources say that Jordan is going back to
+# UTC+2 on 2013-12-19 at midnight:
+# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime
+# Official, in Arabic:
+# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
+# ... Our background/permalink about it
+# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
+# ...
+# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
+# ... says midnight for the coming one and 1:00 for the ones in the future
+# (and they will use DST again next year, using the normal schedule).
+
+# From Paul Eggert (2013-12-11):
+# As Steffen suggested, consider the past 21-month experiment to be DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
@@ -1415,11 +1425,13 @@ Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
-Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
+Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
+Rule Jordan 2013 only - Dec 20 0:00 0 -
+Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S
+Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
- 2:00 Jordan EE%sT 2012 Oct 26 0:00s
- 3:00 - AST
+ 2:00 Jordan EE%sT
# Kazakhstan
diff --git a/lib/modules/Calendar.pmod/tzdata/northamerica b/lib/modules/Calendar.pmod/tzdata/northamerica
index c3921d3857a0caa9f4ceb90bf329c5794a68d240..83c521b83092cd32ebb9f3dc6264305a39daf31e 100644
--- a/lib/modules/Calendar.pmod/tzdata/northamerica
+++ b/lib/modules/Calendar.pmod/tzdata/northamerica
@@ -2665,6 +2665,11 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
# to DST--and one more hour on 1999-04-04--when the announcers will have
# returned to Baltimore, which switches on that date.)
+# From Steffen Thorsen (2013-11-11):
+# DST start in Cuba in 2004 ... does not follow the same rules as the
+# years before. The correct date should be Sunday 2004-03-28 00:00 ...
+# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html
+
# From Evert van der Veer via Steffen Thorsen (2004-10-28):
# Cuba is not going back to standard time this year.
# From Paul Eggert (2006-03-22):
@@ -2854,7 +2859,8 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S
Rule Cuba 1997 only - Oct 12 0:00s 0 S
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
-Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
+Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D
+Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D
Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D