diff --git a/CODEOWNERS b/CODEOWNERS
index 3df0b4e54cf..f3a33c394ca 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -88,6 +88,7 @@ build.json @home-assistant/supervisor
 /tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
+/homeassistant/components/amazon_polly/ @jschlyter
 /homeassistant/components/amberelectric/ @madpilot
 /tests/components/amberelectric/ @madpilot
 /homeassistant/components/ambient_network/ @thomaskistler
diff --git a/homeassistant/components/amazon_polly/manifest.json b/homeassistant/components/amazon_polly/manifest.json
index 803bf8b80aa..73bbdd67162 100644
--- a/homeassistant/components/amazon_polly/manifest.json
+++ b/homeassistant/components/amazon_polly/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "amazon_polly",
   "name": "Amazon Polly",
-  "codeowners": [],
+  "codeowners": ["@jschlyter"],
   "documentation": "https://www.home-assistant.io/integrations/amazon_polly",
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],