diff --git a/CODEOWNERS b/CODEOWNERS
index 008faf3d3d1..0ffd84a5591 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1032,6 +1032,7 @@ homeassistant/components/wemo/* @esev
 tests/components/wemo/* @esev
 homeassistant/components/whirlpool/* @abmantis
 tests/components/whirlpool/* @abmantis
+homeassistant/components/whois/* @frenck
 homeassistant/components/wiffi/* @mampfes
 tests/components/wiffi/* @mampfes
 homeassistant/components/wilight/* @leofig-rj
diff --git a/homeassistant/components/whois/manifest.json b/homeassistant/components/whois/manifest.json
index f591d7bb478..6da78b32b7f 100644
--- a/homeassistant/components/whois/manifest.json
+++ b/homeassistant/components/whois/manifest.json
@@ -3,6 +3,6 @@
   "name": "Whois",
   "documentation": "https://www.home-assistant.io/integrations/whois",
   "requirements": ["python-whois==0.7.3"],
-  "codeowners": [],
+  "codeowners": ["@frenck"],
   "iot_class": "cloud_polling"
 }