diff --git a/CODEOWNERS b/CODEOWNERS
index b33246766d5104f3c25dbb9a374cf7baab7e05f8..613617e99422c02a1bcc0fc08cb2cba02cbfcc35 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -226,7 +226,7 @@ homeassistant/components/keenetic_ndms2/* @foxel
 homeassistant/components/kef/* @basnijholt
 homeassistant/components/keyboard_remote/* @bendavid
 homeassistant/components/knx/* @Julius2342 @farmio @marvin-w
-homeassistant/components/kodi/* @OnFreund
+homeassistant/components/kodi/* @OnFreund @cgtobi
 homeassistant/components/konnected/* @heythisisnate @kit-klein
 homeassistant/components/lametric/* @robbiet480
 homeassistant/components/launch_library/* @ludeeus
diff --git a/homeassistant/components/kodi/manifest.json b/homeassistant/components/kodi/manifest.json
index da4daf85ada24af295e0e41c188d01dd8bb0d560..a9df9718f8cd7f6e1758efe87183892a93fb9f02 100644
--- a/homeassistant/components/kodi/manifest.json
+++ b/homeassistant/components/kodi/manifest.json
@@ -4,7 +4,8 @@
   "documentation": "https://www.home-assistant.io/integrations/kodi",
   "requirements": ["pykodi==0.2.0"],
   "codeowners": [
-    "@OnFreund"
+    "@OnFreund",
+    "@cgtobi"
   ],
   "zeroconf": ["_xbmc-jsonrpc-h._tcp.local."],
   "config_flow": true