diff --git a/pkgs/development/python-modules/pymochad/default.nix b/pkgs/development/python-modules/pymochad/default.nix
new file mode 100644
index 000000000000..0ac6ba8931de
--- /dev/null
+++ b/pkgs/development/python-modules/pymochad/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pbr,
+  setuptools,
+  six,
+  pytestCheckHook,
+  mock,
+  fixtures,
+  testtools,
+}:
+
+buildPythonPackage rec {
+  pname = "pymochad";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mtreinish";
+    repo = "pymochad";
+    tag = version;
+    hash = "sha256-nwh97sbYkt4F/u02zTDemWEztSco27oJCemd6kTnCMk=";
+  };
+
+  env.PBR_VERSION = version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  dependencies = [
+    six
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+    fixtures
+    testtools
+  ];
+
+  pythonImportsCheck = [
+    "pymochad"
+  ];
+
+  meta = {
+    description = "Python library for sending commands to the mochad TCP gateway daemon for the X10 CMA15A controller";
+    homepage = "https://github.com/mtreinish/pymochad";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a6ae6dfd7d37..3ab52b4562dd 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3680,7 +3680,8 @@
       ];
     "mochad" =
       ps: with ps; [
-      ]; # missing inputs: pymochad
+        pymochad
+      ];
     "modbus" =
       ps: with ps; [
         pymodbus
@@ -7373,6 +7374,7 @@
     "mjpeg"
     "moat"
     "mobile_app"
+    "mochad"
     "modbus"
     "modem_callerid"
     "modern_forms"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3713c4c4aac6..38b37cde805d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13298,6 +13298,8 @@ self: super: with self; {
 
   pymitv = callPackage ../development/python-modules/pymitv { };
 
+  pymochad = callPackage ../development/python-modules/pymochad { };
+
   pymodbus = callPackage ../development/python-modules/pymodbus { };
 
   pymodbus-repl = callPackage ../development/python-modules/pymodbus-repl { };