diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
index 755736ea19c..d067f77c70e 100644
--- a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
+++ b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
@@ -419,7 +419,7 @@ qulonglong BufferedSocketDevice::WaitForMore(
 
         msecs  = 1s;
 
-        nBytes = m_pSocket->waitForMore( msecs.count(), &bTimeout );
+        nBytes = m_pSocket->waitForMore( msecs, &bTimeout );
 
         if (pTimeout != nullptr)
             *pTimeout = bTimeout;
diff --git a/mythtv/libs/libmythupnp/msocketdevice.h b/mythtv/libs/libmythupnp/msocketdevice.h
index 0cd239a71dc..31d76da75a8 100644
--- a/mythtv/libs/libmythupnp/msocketdevice.h
+++ b/mythtv/libs/libmythupnp/msocketdevice.h
@@ -44,11 +44,15 @@
 #ifndef MSOCKETDEVICE_H
 #define MSOCKETDEVICE_H
 
+#include <chrono>
+
 #include <QIODevice>
 #include <QHostAddress> // int->QHostAddress conversion
 
 #include "upnpexp.h"
 
+using namespace std::chrono_literals;
+
 class MSocketDevicePrivate;
 
 class UPNP_PUBLIC MSocketDevice: public QIODevice
@@ -111,7 +115,7 @@ class UPNP_PUBLIC MSocketDevice: public QIODevice
     virtual int  accept();
 
     qint64  bytesAvailable() const override; // QIODevice
-    qint64  waitForMore(int msecs, bool *timeout = nullptr) const;
+    qint64  waitForMore(std::chrono::milliseconds msecs, bool *timeout = nullptr) const;
     virtual qint64 writeBlock(const char *data, quint64 len,
                               const QHostAddress & host, quint16 port);
     inline qint64  writeBlock(const char *data, quint64 len)
diff --git a/mythtv/libs/libmythupnp/msocketdevice_unix.cpp b/mythtv/libs/libmythupnp/msocketdevice_unix.cpp
index ef98d69b805..ed5e7494575 100644
--- a/mythtv/libs/libmythupnp/msocketdevice_unix.cpp
+++ b/mythtv/libs/libmythupnp/msocketdevice_unix.cpp
@@ -888,7 +888,7 @@ qint64 MSocketDevice::bytesAvailable() const
 
     \sa bytesAvailable()
 */
-qint64 MSocketDevice::waitForMore(int msecs, bool *timeout) const
+qint64 MSocketDevice::waitForMore(std::chrono::milliseconds msecs, bool *timeout) const
 {
     if (!isValid())
         return -1;
@@ -904,11 +904,11 @@ qint64 MSocketDevice::waitForMore(int msecs, bool *timeout) const
 
     FD_SET(m_fd, &fds);
 
-    tv.tv_sec = msecs / 1000;
+    tv.tv_sec = msecs.count() / 1000;
 
-    tv.tv_usec = (msecs % 1000) * 1000;
+    tv.tv_usec = (msecs.count() % 1000) * 1000;
 
-    int rv = select(m_fd + 1, &fds, nullptr, nullptr, msecs < 0 ? nullptr : &tv);
+    int rv = select(m_fd + 1, &fds, nullptr, nullptr, msecs < 0ms ? nullptr : &tv);
 
     if (rv < 0)
         return -1;
@@ -1170,7 +1170,7 @@ qint64 MSocketDevice::writeData(const char *data, qint64 len)
                     break;
             }
         }
-        else if (waitForMore(0, &timeout) == 0)
+        else if (waitForMore(0ms, &timeout) == 0)
         {
             if (!timeout)
             {
diff --git a/mythtv/libs/libmythupnp/upnphelpers.cpp b/mythtv/libs/libmythupnp/upnphelpers.cpp
index a5ec671cb48..7cf84f42751 100644
--- a/mythtv/libs/libmythupnp/upnphelpers.cpp
+++ b/mythtv/libs/libmythupnp/upnphelpers.cpp
@@ -23,7 +23,7 @@ QString DurationFormat(std::chrono::milliseconds msec)
     {
         dayStr = QString("D%1").arg((msec % 24h).count());
     }
-    QString timeStr = UPnPDateTime::TimeFormat(msec.count());
+    QString timeStr = UPnPDateTime::TimeFormat(msec);
 
     return durationStr.arg(dayStr).arg(timeStr);
 }
@@ -34,9 +34,9 @@ QString TimeFormat(const QTime time)
     return timeStr;
 }
 
-QString TimeFormat(uint32_t msec)
+    QString TimeFormat(std::chrono::milliseconds msec)
 {
-    QTime time = QTime::fromMSecsSinceStartOfDay(msec);
+    QTime time = QTime::fromMSecsSinceStartOfDay(msec.count());
     return time.toString("HH:mm:ss");
 }
 
diff --git a/mythtv/libs/libmythupnp/upnphelpers.h b/mythtv/libs/libmythupnp/upnphelpers.h
index 37442eae9ce..7b9f94a53b5 100644
--- a/mythtv/libs/libmythupnp/upnphelpers.h
+++ b/mythtv/libs/libmythupnp/upnphelpers.h
@@ -84,7 +84,7 @@ namespace UPnPDateTime
      * UPnP ContentDirectory Service 2008, 2013
      * Appendix D.1 Date&Time Syntax
      */
-    UPNP_PUBLIC QString TimeFormat(uint32_t msec);
+    UPNP_PUBLIC QString TimeFormat(std::chrono::milliseconds msec);
 
     /**
      * Date-Time Format