diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index bc1f627..764052c 100644
--- a/mythtv/programs/mythbackend/scheduler.cpp
+++ b/mythtv/programs/mythbackend/scheduler.cpp
@@ -3433,12 +3433,12 @@ static QString progfindid = QString(
 "  WHEN %1 "
 "   THEN RECTABLE.findid "
 "  WHEN %2 "
-"   THEN to_days(date_sub(program.starttime, interval "
-"                time_format(RECTABLE.findtime, '%H:%i') hour_minute)) "
+"   THEN to_days(date_sub(convert_tz(program.starttime, 'UTC', 'SYSTEM'), "
+"            interval time_format(RECTABLE.findtime, '%H:%i') hour_minute)) "
 "  WHEN %3 "
-"   THEN floor((to_days(date_sub(program.starttime, interval "
-"               time_format(RECTABLE.findtime, '%H:%i') hour_minute)) - "
-"               RECTABLE.findday)/7) * 7 + RECTABLE.findday "
+"   THEN floor((to_days(date_sub(convert_tz(program.starttime, 'UTC', "
+"            'SYSTEM'), interval time_format(RECTABLE.findtime, '%H:%i') "
+"            hour_minute)) - RECTABLE.findday)/7) * 7 + RECTABLE.findday "
 "  WHEN %4 "
 "   THEN RECTABLE.findid "
 "  ELSE 0 "
@@ -3572,15 +3572,15 @@ void Scheduler::UpdateMatches(uint recordid, uint sourceid, uint mplexid,
 "  AND "
 "  ((RECTABLE.type = %5) " // channelrecord
 "   OR"
-"   ((TIME_TO_SEC(RECTABLE.starttime) = TIME_TO_SEC(program.starttime)) " // timeslot matches
+"   (( TIME(CONVERT_TZ(ADDTIME(RECTABLE.startdate, RECTABLE.starttime), 'UTC', 'SYSTEM')) = TIME(CONVERT_TZ(program.starttime, 'UTC', 'SYSTEM'))) " // timeslot matches
 "    AND "
 "    ((RECTABLE.type = %6) " // timeslotrecord
 "     OR"
-"     ((DAYOFWEEK(RECTABLE.startdate) = DAYOFWEEK(program.starttime) "
+"     ((DAYOFWEEK(CONVERT_TZ(ADDTIME(RECTABLE.startdate, RECTABLE.starttime), 'UTC', 'SYSTEM')) = DAYOFWEEK(CONVERT_TZ(program.starttime, 'UTC', 'SYSTEM')) "
 "      AND "
 "      ((RECTABLE.type = %7) " // weekslotrecord
 "       OR"
-"       ((TO_DAYS(RECTABLE.startdate) = TO_DAYS(program.starttime)) " // date matches
+"       ((ADDTIME(RECTABLE.startdate, RECTABLE.starttime) = program.starttime) " // date/time matches
 "        AND (RECTABLE.type <> %8)" // single,override,don't,etc.
 "        )"
 "       )"