diff --git a/CODEOWNERS b/CODEOWNERS
index cb9180d717d..6abb7535574 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -182,6 +182,7 @@ homeassistant/components/monoprice/* @etsinko
 homeassistant/components/moon/* @fabaff
 homeassistant/components/mpd/* @fabaff
 homeassistant/components/mqtt/* @home-assistant/core
+homeassistant/components/mysensors/* @MartinHjelmare
 homeassistant/components/mystrom/* @fabaff
 homeassistant/components/nello/* @pschmitt
 homeassistant/components/ness_alarm/* @nickw444
diff --git a/homeassistant/components/mysensors/manifest.json b/homeassistant/components/mysensors/manifest.json
index f18f5d4f8dd..536848d3aef 100644
--- a/homeassistant/components/mysensors/manifest.json
+++ b/homeassistant/components/mysensors/manifest.json
@@ -9,5 +9,7 @@
   "after_dependencies": [
     "mqtt"
   ],
-  "codeowners": []
+  "codeowners": [
+    "@MartinHjelmare"
+  ]
 }