diff --git a/src/wp-includes/class-oembed.php b/src/wp-includes/class-oembed.php
index c25b8cb..d50528b 100644
--- a/src/wp-includes/class-oembed.php
+++ b/src/wp-includes/class-oembed.php
@@ -109,6 +109,17 @@ public function __construct() {
 			'#https?://www\.facebook\.com/.*/videos/.*#i'              => array( 'https://www.facebook.com/plugins/video/oembed.json/',       true  ),
 			'#https?://www\.facebook\.com/video\.php.*#i'              => array( 'https://www.facebook.com/plugins/video/oembed.json/',       true  ),
 			'#https?://(www\.)?screencast\.com/.*#i'                   => array( 'https://api.screencast.com/external/oembed',                true  ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(com|com\.mx|com\.br|ca)/.*#i'      => array( 'https://read.amazon.com/kp/api/oembed',     true  ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(co\.uk|de|fr|it|es|in|nl|ru)/.*#i' => array( 'https://read.amazon.co.uk/kp/api/oembed',   true  ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(co\.jp|com\.au)/.*#i'              => array( 'https://read.amazon.com.au/kp/api/oembed',  true  ),
+			'#https?://([a-z0-9-]+\.)?amazon\.cn/.*#i'                            => array( 'https://read.amazon.cn/kp/api/oembed',      true  ),
+			'#https?://(www\.)?a.co/.*#i'                                         => array( 'https://read.amazon.com/kp/api/oembed',                     true  ),
+			'#https?://(www\.)?amz.onl/.*#i'                                      => array( 'https://read.amazon.com/kp/api/oembed',                     true  ),
+			'#https?://(www\.)?amzn.to/.*#i'                                      => array( 'https://read.amazon.com/kp/api/oembed',                     true  ),
+			'#https?://(www\.)?amzn.eu/.*#i'                                      => array( 'https://read.amazon.co.uk/kp/api/oembed',                   true  ),
+			'#https?://(www\.)?amzn.in/.*#i'                                      => array( 'https://read.amazon.in/kp/api/oembed',                      true  ),
+			'#https?://(www\.)?amzn.asia/.*#i'                                    => array( 'https://read.amazon.com.au/kp/api/oembed',                  true  ),
+			'#https?://(www\.)?z.cn/.*#i'                                         => array( 'https://read.amazon.cn/kp/api/oembed',                      true  ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -183,6 +194,28 @@ public function __construct() {
 		 * | Twitter      | twitter.com/likes     |      Yes       | 4.7.0     |
 		 * | Twitter      | twitter.com/lists     |      Yes       | 4.7.0     |
 		 * | Screencast   | screencast.com        |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.com          |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.co.uk        |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.de           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.fr           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.it           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.es           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.co.jp        |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.cn           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.com.au       |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.in           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.com.mx       |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.com.br       |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.ca           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.nl           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| *.amazon.ru           |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| a.co                  |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| amzn.onl              |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| amzn.to               |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| amzn.eu               |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| amzn.in               |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| amzn.asia             |      Yes       | 4.8.0     |
+		 * | Amazon Kindle| z.cn                  |      Yes       | 4.8.0     | 		 
 		 *
 		 * No longer supported providers:
 		 *
diff --git a/tests/phpunit/tests/external-http/oembed.php b/tests/phpunit/tests/external-http/oembed.php
index 3f22739..8cbd537 100644
--- a/tests/phpunit/tests/external-http/oembed.php
+++ b/tests/phpunit/tests/external-http/oembed.php
@@ -43,4 +43,96 @@ function test_youtube_v_url() {
 		$out = $wp_embed->autoembed( 'https://www.youtube.com/v/QcIy9NiNbmo' );
 		$this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out );
 	}
-}
\ No newline at end of file
+
+	/**
+	 * Test Kindle Instant Previews embeds.
+	 *
+	 * @ticket 38181
+	 */
+	function test_amazon_kindle_non_book_embed() {
+		$out = wp_oembed_get( 'http://www.amazon.com/All-New-Kindle-E-reader-Glare-Free-Touchscreen/dp/B00ZV9PXP2/r' );
+		$this->assertFalse( $out );
+
+		$out = wp_oembed_get( 'https://www.amazon.com/All-New-Kindle-E-reader-Glare-Free-Touchscreen/dp/B00ZV9PXP2/r' );
+		$this->assertFalse( $out );
+	}
+
+	/**
+	 * Support for Kindle previews shared from Kindle devices or apps.
+	 *
+	 * @link http://www.amazon.com/bettersharing Kindle Instant Previews sharing homepage
+	 *
+	 * @ticket 38181
+	 */
+	function test_amazon_kindle_shared_preview_embed() {
+		// Book.
+		$out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B008TW1HMG&tag=foo-20' );
+		$this->assertContains( 'https://read.amazon.com/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// Quote.
+		$out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B00DPM7TIG&tag=foo-20&id=XD3ezAVVQ3KP0bWxSFvosg' );
+		$this->assertContains( 'https://read.amazon.com/kp/card?', $out );
+		$this->assertContains( 'asin=B00DPM7TIG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// Reading progress.
+		$out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B007P7HRS4&id=Sd6UmMYYTc6rHl1BYkXU2g&tag=foo-20' );
+		$this->assertContains( 'https://read.amazon.com/kp/card?', $out );
+		$this->assertContains( 'asin=B007P7HRS4', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+	}
+
+	/**
+	 * Support for Kindle previews created from the self-service embedding tool
+	 *
+	 * @link http://www.amazon.com/kindleinstantpreview Kindle Instant Previews for third parties
+	 *
+	 * @ticket 38181
+	 */
+	function test_amazon_kindle_embedded_preview_embed() {
+		// URL.
+		$out = wp_oembed_get( 'https://read.amazon.com/kp/embed?asin=B008TW1HMG&tag=foo-20' );
+		$this->assertContains( 'https://read.amazon.com/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// Interactive book card.
+		$out = wp_oembed_get( 'https://read.amazon.com/kp/card?asin=B008TW1HMG&tag=foo-20&preview=inline' );
+		$this->assertContains( 'https://read.amazon.com/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+	}
+
+	/**
+	 * Support for Kindle Instant Previews in non-US marketplaces
+	 *
+	 * @ticket 38181
+	 */
+	function test_amazon_kindle_preview_non_us_embed() {
+		// Americas (canonical TLD: .com)
+		$out = wp_oembed_get( 'https://read.amazon.ca/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux' );
+		$this->assertContains( 'https://read.amazon.ca/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// Europe (canonical TLD: .co.uk)
+		$out = wp_oembed_get( 'https://read.amazon.in/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux' );
+		$this->assertContains( 'https://read.amazon.in/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// Asia (canonical TLD: .com.au)
+		$out = wp_oembed_get( 'https://read.amazon.co.jp/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux&preview=inline' );
+		$this->assertContains( 'https://read.amazon.com.au/kp/card?', $out );
+		$this->assertContains( 'asin=B008TW1HMG', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+
+		// China (canonical TLD: .cn)
+		$out = wp_oembed_get( 'https://read.amazon.cn/kp/embed?asin=B01M06TYLV&tag=foo-20&ref_=bar_qux&preview=inline' );
+		$this->assertContains( 'https://read.amazon.cn/kp/card?', $out );
+		$this->assertContains( 'asin=B01M06TYLV', $out );
+		$this->assertContains( 'tag=foo-20', $out );
+	}
+}