diff --git a/lib/socketserver/GwSocketServer.cpp b/lib/socketserver/GwSocketServer.cpp
index 9ee480a..7dacd26 100644
--- a/lib/socketserver/GwSocketServer.cpp
+++ b/lib/socketserver/GwSocketServer.cpp
@@ -1,4 +1,5 @@
 #include "GwSocketServer.h"
+#include <ESPmDNS.h>
 
 GwSocketServer::GwSocketServer(const GwConfigHandler *config,GwLog *logger){
     this->config=config;
@@ -9,6 +10,7 @@ void GwSocketServer::begin(){
     server->begin();
     logger->logString("Socket server created, port=%d",
         config->getInt(config->serverPort));
+    MDNS.addService("_nmea-0183","_tcp",config->getInt(config->serverPort));    
 
 }
 void GwSocketServer::loop()
diff --git a/src/main.cpp b/src/main.cpp
index 7e31f84..f5cb80b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,7 @@
 #include <WebServer.h>
 #include <Preferences.h>
 #include <ArduinoJson.h>
+#include <ESPmDNS.h>
 
 #include "N2kDataToNMEA0183.h"
 
@@ -191,7 +192,7 @@ void setup() {
   sendTCP=config.getConfigItem(config.sendTCP,true);
   sendSeasmart=config.getConfigItem(config.sendSeasmart,true);
   systemName=config.getConfigItem(config.systemName,true);
-  
+  MDNS.begin(config.getConfigItem(config.systemName)->asCString());
   gwWifi.setup();
 
   // Start TCP server
@@ -209,6 +210,8 @@ void setup() {
   webserver.begin();
   Serial.println("HTTP server started");
 
+  MDNS.addService("_http","_tcp",80);
+
   // Reserve enough buffer for sending all messages. This does not work on small memory devices like Uno or Mega
 
   NMEA2000.SetN2kCANMsgBufSize(8);