diff --git a/include/holidays/us.rem b/include/holidays/us.rem
index 7184245f..bf9a8b2b 100644
--- a/include/holidays/us.rem
+++ b/include/holidays/us.rem
@@ -19,13 +19,9 @@ REM Feb 14 MSG %"Valentine's Day%"
 REM Third Monday in Feb SCANFROM -7 ADDOMIT MSG %"President's Day%"
 REM Mar 17 MSG %"St. Patrick's Day%"
 
-# The DST rules are accurate for most locations in
-# North America
-REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
-REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
-
-REM Last Sunday in October ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
-REM First Sunday in November ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+# These are accurate for most places in North America
+REM MAYBE-UNCOMPUTABLE Sun November SATISFY [isdst($T) != isdst($T+1)] MSG Daylight Saving Time Ends
+REM MAYBE-UNCOMPUTABLE Sun March SATISFY [isdst($T) != isdst($T+1)] MSG Daylight Saving Time Starts
 
 REM Apr 1 MSG %"April Fool's%" Day
 REM Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
@@ -35,15 +31,24 @@ REM Second Sun in May MSG %"Mother's Day%"
 REM Third Sat in May MSG %"Armed Forces Day%"
 REM Last Monday in May SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
 REM Jun 14 MSG %"Flag Day%"
+
+REM July 4 SCANFROM -7 ADDOMIT MSG Independence Day
+REM July 3 SCANFROM -7 ADDOMIT SATISFY [$Tw == 5] MSG Independence Day (observed)
+REM July 5 SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Independence Day (observed)
+
 REM Third Sun in June MSG %"Father's Day%"
 REM First Mon in Sep SCANFROM -7 ADDOMIT MSG %"Labor Day%"
-REM Second Mon in Oct MSG %"Columbus Day%"
+REM Second Mon in Oct MSG %"Columbus Day / Indigenous Peoples' Day%"
 REM Nov 11 MSG %"Veterans Day%"
 
 REM Oct 30 MSG %"Mischief Night%"
 REM Oct 31 MSG %"Halloween%"
+
 REM Tue Nov  2 SCANFROM -7 SATISFY [($Ty % 4) == 0] MSG %"Election Day%"
-REM Last Thu in Nov SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
-REM Fri Nov [Week_4+1] SCANFROM -7 ADDOMIT MSG %"Thanksgiving (cont.)%"
+
+REM Thu 22 Nov SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
+
+REM Fri 23 Nov SCANFROM -7 ADDOMIT MSG %"Thanksgiving (cont.)%"
+
 REM Dec 24 MSG %"Christmas Eve%"
 OMIT Dec 25 MSG %"Christmas%" Day