diff --git a/mythtv/libs/libmythbase/bonjourregister.cpp b/mythtv/libs/libmythbase/bonjourregister.cpp
index 017ee6d..8922811 100644
--- a/mythtv/libs/libmythbase/bonjourregister.cpp
+++ b/mythtv/libs/libmythbase/bonjourregister.cpp
@@ -5,6 +5,7 @@

 #include "mythlogging.h"
 #include "bonjourregister.h"
+#include "mythcorecontext.h"

 #define LOC QString("Bonjour: ")

@@ -41,11 +42,14 @@ bool BonjourRegister::Register(uint16_t port, const QByteArray &type,
         return true;
     }

+    QString host(gCoreContext->GetSetting("BonjourHostname", ""));
+    QByteArray host_ba = host.toAscii();
+    const char *host_ptr = host.size() > 0 ? host_ba.constData() : NULL;
     uint16_t qport = qToBigEndian(port);
     DNSServiceErrorType res =
         DNSServiceRegister(&m_dnssref, 0, 0, (const char*)name.data(),
                            (const char*)type.data(),
-                           NULL, 0, qport, txt.size(), (void*)txt.data(),
+                           NULL, host_ptr, qport, txt.size(), (void*)txt.data(),
                            BonjourCallback, this);

     if (kDNSServiceErr_NoError != res)