diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index ba96b08..1f2299e 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -235,6 +235,7 @@ if ( ! CUSTOM_TAGS ) {
 			'longdesc' => true,
 			'vspace' => true,
 			'src' => true,
+			'srcset' => true,
 			'usemap' => true,
 			'width' => true,
 		),
@@ -272,6 +273,7 @@ if ( ! CUSTOM_TAGS ) {
 			'lang' => true,
 			'xml:lang' => true,
 		),
+		'picture' => array(),
 		'pre' => array(
 			'width' => true,
 		),
@@ -293,6 +295,12 @@ if ( ! CUSTOM_TAGS ) {
 			'xml:lang' => true,
 		),
 		'small' => array(),
+		'source' => array(
+			'srcset' => true,
+			'type' => true,
+			'media' => true,
+			'sizes' => true,
+		),
 		'strike' => array(),
 		'strong' => array(),
 		'sub' => array(),
diff --git a/tests/phpunit/tests/kses.php b/tests/phpunit/tests/kses.php
index 657fb30..c9904a8 100644
--- a/tests/phpunit/tests/kses.php
+++ b/tests/phpunit/tests/kses.php
@@ -75,6 +75,56 @@ class Tests_Kses extends WP_UnitTestCase {
 		}
 	}
 
+	/**
+	 * @ticket 29807
+	 */
+	function test_wp_filter_post_kses_img() {
+		global $allowedposttags;
+
+		$attributes = array(
+			'class' => 'classname',
+			'id' => 'idattr',
+			'style' => 'color: red;',
+			'alt' => 'alt',
+			'src' => '/test.png',
+			'srcset' => '/test.png 2x',
+			'width' => '100',
+			'height' => '100',
+			'usemap' => '#hash',
+			'ismap' => 'ismap',
+			'vspace' => '20',
+			'hspace' => '20',
+			'longdesc' => 'this is the longdesc',
+			'align' => 'middle',
+			'border' => '5',
+		);
+
+		foreach ( $attributes as $name => $value ) {
+
+			if ( $name === $value ) {
+				$string = "<img $value />";
+				$expect_string = "<img " . trim( $value, ';' ) . " />";
+			} else {
+				$string = "<img $name='$value' />";
+				$expect_string = "<img $name='" . trim( $value, ';' ) . "' />";
+			}
+
+			$this->assertEquals( $expect_string, wp_kses( $string, $allowedposttags ) );
+
+		}
+	}
+
+	/**
+	 * @ticket 29807
+	 */
+	function test_wp_filter_post_kses_picture() {
+		global $allowedposttags;
+
+		$html = '<picture><source srcset="pear-mobile.jpeg" media="(max-width: 720px)" type="image/png"><source srcset="pear-tablet.jpeg" media="(max-width: 1280px)" type="image/png"><img src="pear-desktop.jpeg" alt="The pear is juicy."></picture>';
+		$this->assertEquals( $html, wp_kses( $html, $allowedposttags ) );
+
+	}
+
 	function test_feed_links() {
 		global $allowedposttags;
 
@@ -374,7 +424,7 @@ EOF;
 		$this->assertEquals( '&frac34;', wp_kses_normalize_entities( '&frac34;' ) );
 		$this->assertEquals( '&there4;', wp_kses_normalize_entities( '&there4;' ) );
 	}
-	
+
 	/**
 	 * Test removal of invalid binary data for HTML.
 	 *
