diff --git a/lib/config/defaults.js b/lib/config/defaults.js
index 2f4982b3..776ced99 100644
--- a/lib/config/defaults.js
+++ b/lib/config/defaults.js
@@ -15,10 +15,11 @@ var config = {
 		{ selector: 'link[rel="stylesheet"]', attr: 'href' },
 		{ selector: 'link[rel*="icon"]', attr: 'href' },
 		{ selector: 'svg *[xlink\\:href]', attr: 'xlink:href' },
-		{ selector: 'svg *[href]', attr: 'href' }
+		{ selector: 'svg *[href]', attr: 'href' },
+		{ selector: 'picture source', attr: 'srcset' }
 	],
 	subdirectories: [
-		{ directory: 'images', extensions: ['.png', '.jpg', '.jpeg', '.gif'] },
+		{ directory: 'images', extensions: ['.png', '.jpg', '.jpeg', '.gif', '.webp'] },
 		{ directory: 'js', extensions: ['.js'] },
 		{ directory: 'css', extensions: ['.css'] },
 		{ directory: 'fonts', extensions: ['.ttf', '.woff', '.woff2', '.eot', '.svg'] }
diff --git a/lib/resource-handler/html/html-source-element.js b/lib/resource-handler/html/html-source-element.js
index 51fcec52..a733cc3e 100644
--- a/lib/resource-handler/html/html-source-element.js
+++ b/lib/resource-handler/html/html-source-element.js
@@ -7,7 +7,7 @@ var utils = require('../../utils');
 var pathContainersByRule = [
 	{ selector: '[style]', attr: 'style', containerClass: CssText },
 	{ selector: 'style', containerClass: CssText },
-	{ selector: 'img[srcset]', attr: 'srcset', containerClass: ImgSrcsetTag }
+	{ selector: '*[srcset]', attr: 'srcset', containerClass: ImgSrcsetTag }
 ];
 
 /**