diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp
index 273d258b..bd402c87 100644
--- a/tools/esp8266/app.cpp
+++ b/tools/esp8266/app.cpp
@@ -699,6 +699,8 @@ void app::sendMqttDiscoveryConfig(void) {
                 deviceDoc["name"] = iv->name;
                 deviceDoc["ids"] = String(iv->serial.u64, HEX);
                 deviceDoc["cu"] = F("http://") + String(WiFi.localIP().toString());
+                deviceDoc["mf"] = "Hoymiles";
+                deviceDoc["mdl"] = iv->name;
                 JsonObject deviceObj = deviceDoc.as<JsonObject>();
                 DynamicJsonDocument doc(384);
 
diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index ce21e996..39f61ff6 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       11
+#define VERSION_PATCH       12
 
 
 //-------------------------------------
diff --git a/tools/rpi/ahoy.yml.example b/tools/rpi/ahoy.yml.example
index 8438b9f7..15b2cd91 100644
--- a/tools/rpi/ahoy.yml.example
+++ b/tools/rpi/ahoy.yml.example
@@ -16,6 +16,8 @@ ahoy:
     port: 1883
     user: 'username'
     password: 'password'
+    useTLS: False
+    insecureTLS: False #set True for e.g. self signed certificates. 
 
   # Influx2 output
   influxdb:
diff --git a/tools/rpi/hoymiles/__main__.py b/tools/rpi/hoymiles/__main__.py
index 71b0fe13..f41dd7da 100644
--- a/tools/rpi/hoymiles/__main__.py
+++ b/tools/rpi/hoymiles/__main__.py
@@ -226,6 +226,11 @@ if __name__ == '__main__':
     mqtt_config = ahoy_config.get('mqtt', [])
     if not mqtt_config.get('disabled', False):
         mqtt_client = paho.mqtt.client.Client()
+        
+        if mqtt_config.get('useTLS',False):
+            mqtt_client.tls_set()
+            mqtt_client.tls_insecure_set(mqtt_config.get('insecureTLS',False))
+
         mqtt_client.username_pw_set(mqtt_config.get('user', None), mqtt_config.get('password', None))
         mqtt_client.connect(mqtt_config.get('host', '127.0.0.1'), mqtt_config.get('port', 1883))
         mqtt_client.loop_start()