diff --git a/package.json b/package.json
index 552869b2c..e86680316 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,14 @@
   "version": "8.13.2",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "dist/mermaid.core.js",
-  "module": "dist/mermaid.esm.min.js",
+  "module": "dist/mermaid.esm.min.mjs",
+  "exports": {
+    ".": {
+      "require": "./dist/mermaid.core.js",
+      "import": "./dist/mermaid.esm.min.mjs"
+    },
+    "./*": "./*"
+  },
   "keywords": [
     "diagram",
     "markdown",
diff --git a/webpack.config.prod.babel.js b/webpack.config.prod.babel.js
index 6591d3ef9..440653593 100644
--- a/webpack.config.prod.babel.js
+++ b/webpack.config.prod.babel.js
@@ -12,6 +12,6 @@ esmConfig.output.library = {
 esmConfig.experiments = {
   outputModule: true,
 };
-esmConfig.output.filename = '[name].esm.min.js';
+esmConfig.output.filename = '[name].esm.min.mjs';
 
 export default [umdConfig, esmConfig];