diff --git a/code/espurna/homeassistant.ino b/code/espurna/homeassistant.ino
index 3dc2ecca..b4c8f345 100644
--- a/code/espurna/homeassistant.ino
+++ b/code/espurna/homeassistant.ino
@@ -259,7 +259,9 @@ void _haGetDeviceConfig(JsonObject& config) {
     
     config.createNestedArray("identifiers").add(identifier);
     config["name"] = _haFixName(getSetting("hostname"));
-    config["manufacturer"] = "Espurna";
+    config["manufacturer"] = String("Espurna");
+    config["model"] = getBoardName();
+    config["sw_version"] = String(APP_VERSION) + " (" + getCoreVersion() + ")";
 }
 
 void _haSend() {