diff --git a/libguh-core/tcpserver.cpp b/libguh-core/tcpserver.cpp
index eb8fb361..5f1661ea 100644
--- a/libguh-core/tcpserver.cpp
+++ b/libguh-core/tcpserver.cpp
@@ -157,6 +157,7 @@ bool TcpServer::startServer()
     txt.insert("manufacturer", "guh GmbH");
     txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
     txt.insert("name", GuhCore::instance()->configuration()->serverName());
+    txt.insert("sslEnabled", configuration().sslEnabled ? "true" : "false");
     m_avahiService->registerService("guhIO", configuration().port, "_jsonrpc._tcp", txt);
 
     qCDebug(dcConnection) << "Started Tcp server on" << m_server->serverAddress().toString() << m_server->serverPort();
diff --git a/libguh-core/webserver.cpp b/libguh-core/webserver.cpp
index 80542a66..a2d3f66d 100644
--- a/libguh-core/webserver.cpp
+++ b/libguh-core/webserver.cpp
@@ -522,6 +522,7 @@ bool WebServer::startServer()
     txt.insert("manufacturer", "guh GmbH");
     txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
     txt.insert("name", GuhCore::instance()->configuration()->serverName());
+    txt.insert("sslEnabled", m_configuration.sslEnabled ? "true" : "false");
     m_avahiService->registerService("guhIO", m_configuration.port, "_http._tcp", txt);
 
     m_enabled = true;
diff --git a/libguh-core/websocketserver.cpp b/libguh-core/websocketserver.cpp
index 169735b2..5a2f7de9 100644
--- a/libguh-core/websocketserver.cpp
+++ b/libguh-core/websocketserver.cpp
@@ -225,6 +225,7 @@ bool WebSocketServer::startServer()
     txt.insert("manufacturer", "guh GmbH");
     txt.insert("uuid", GuhCore::instance()->configuration()->serverUuid().toString());
     txt.insert("name", GuhCore::instance()->configuration()->serverName());
+    txt.insert("sslEnabled", configuration().sslEnabled ? "true" : "false");
     m_avahiService->registerService("guhIO", configuration().port, "_ws._tcp", txt);
 
     return true;
diff --git a/libguh/network/avahi/qt-watch.cpp b/libguh/network/avahi/qt-watch.cpp
index f542510a..6bca5789 100644
--- a/libguh/network/avahi/qt-watch.cpp
+++ b/libguh/network/avahi/qt-watch.cpp
@@ -93,7 +93,7 @@ void AvahiWatch::gotIn()
 
 void AvahiWatch::gotOut()
 {
-    m_lastEvent = AVAHI_WATCH_IN;
+    m_lastEvent = AVAHI_WATCH_OUT;
     m_incallback = true;
     m_callback(this, m_fd, m_lastEvent, m_userdata);
     m_incallback = false;