diff --git a/CODEOWNERS b/CODEOWNERS
index 8775e8867871..9c8cc4b1c0e9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -97,6 +97,7 @@ homeassistant/components/history_graph/* @andrey-git
 homeassistant/components/hive/* @Rendili @KJonline
 homeassistant/components/homeassistant/* @home-assistant/core
 homeassistant/components/homekit/* @cdce8p
+homeassistant/components/homematic/* @pvizeli @danielperna84
 homeassistant/components/html5/* @robbiet480
 homeassistant/components/http/* @home-assistant/core
 homeassistant/components/huawei_lte/* @scop
diff --git a/homeassistant/components/homematic/manifest.json b/homeassistant/components/homematic/manifest.json
index cba29992f23f..7c80806cae58 100644
--- a/homeassistant/components/homematic/manifest.json
+++ b/homeassistant/components/homematic/manifest.json
@@ -6,5 +6,8 @@
     "pyhomematic==0.1.58"
   ],
   "dependencies": [],
-  "codeowners": []
+  "codeowners": [
+    "@pvizeli",
+    "@danielperna84"
+  ]
 }