diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29ff2f69..7c1c58b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 [Unpublished]: https://github.com/file-icons/atom/compare/v2.1.22...HEAD
 
 
+[Unpublished]
+----------------------
+### Added
+- [[`#748`][]]: Significantly better support for [Webpack configs][], which no longer require `config` or `conf` to be part of the filename.
+
+[Webpack configs]: https://webpack.js.org/guides/production/
+[`#748`]: https://github.com/file-icons/atom/issues/748
+
+
+
 [v2.1.22] - 2018-07-03
 ----------------------
 ### Added
diff --git a/config.cson b/config.cson
index 53497a5c..bf0cbba7 100644
--- a/config.cson
+++ b/config.cson
@@ -4821,10 +4821,8 @@ fileIcons:
 	Webpack:
 		icon: "webpack"
 		priority: 2
-		match: [
-			[/webpack(\.[\w\-]+)*\.conf(ig)?\./i, "medium-blue"]
-			[/^webpackfile\.js$/i, "medium-blue"]
-		]
+		match: /(^|\.)webpack(file)?(?=\.|$).*\.([jt]sx?|json)$/i
+		colour: "medium-blue"
 
 	WeChat:
 		icon: "wechat"
diff --git a/lib/icons/.icondb.js b/lib/icons/.icondb.js
index a66d9ddd..f46d01bf 100644
--- a/lib/icons/.icondb.js
+++ b/lib/icons/.icondb.js
@@ -211,7 +211,7 @@ module.exports = [
 ["vs-icon",["dark-green","dark-green"],/\.vssettings(?:\.json)?$/i,2],
 ["vs-icon",["medium-blue","medium-blue"],/\.vscodeignore(?:\.json)?$/i,2],
 ["watchman-icon",["medium-blue","medium-blue"],/\.watchmanconfig$|^watchman\.json$/i,2],
-["webpack-icon",["medium-blue","medium-blue"],/webpack(?:\.[\w\-]+)*\.conf(?:ig)?\.|^webpackfile\.js$/i,2],
+["webpack-icon",["medium-blue","medium-blue"],/(?:^|\.)webpack(?:file)?(?=\.|$).*\.(?:[jt]sx?|json)$/i,2],
 ["wercker-icon",["medium-purple","medium-purple"],/^wercker\.ya?ml$/i,2],
 ["workbox-icon",["medium-orange","medium-orange"],/^workbox-config\.js$/i,2],
 ["yarn-icon",["medium-blue","medium-blue"],/^yarn\.lock$|\.yarn-metadata(?:\.json)?$/i,2],