diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a6c79ffae0c3..92da8927e855 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19520,6 +19520,12 @@
     githubId = 1488603;
     name = "François Espinet";
   };
+  netpleb = {
+    email = "netpleb@proton.me";
+    github = "netpleb";
+    githubId = 130105838;
+    name = "netpleb";
+  };
   netthier = {
     email = "netthier@proton.me";
     name = "nett_hier";
diff --git a/pkgs/servers/home-assistant/custom-components/goodwe/package.nix b/pkgs/servers/home-assistant/custom-components/goodwe/package.nix
new file mode 100644
index 000000000000..7c969d1423dc
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/goodwe/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  goodwe,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "mletenay";
+  domain = "goodwe";
+  version = "0.9.9.30";
+
+  src = fetchFromGitHub {
+    owner = "mletenay";
+    repo = "home-assistant-goodwe-inverter";
+    tag = "v${version}";
+    hash = "sha256-/R0HBR1369gjjdCInbFzUaBEclw4PJDmgRGHtlUNvCA=";
+  };
+
+  dependencies = [
+    goodwe
+  ];
+
+  ignoreVersionRequirement = [ "goodwe" ];
+
+  meta = {
+    changelog = "https://github.com/mletenay/home-assistant-goodwe-inverter/releases/tag/${src.tag}";
+    description = "Experimental version of Home Assistant integration for Goodwe solar inverters";
+    homepage = "https://github.com/mletenay/home-assistant-goodwe-inverter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ netpleb ];
+  };
+}