diff --git a/HISTORY.md b/HISTORY.md
index 4b4b97c..6a10515 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,12 @@
 https://github.com/josdejong/jsoneditor
 
 
+## not yet published, version 8.6.8
+
+- Fix #858: the `dist/jsoneditor.js` bundle containing a link to a 
+  non-existing source map.
+
+
 ## not yet published, version 8.6.7
 
 - Update dependencies to `ajv@6.12.2`.
diff --git a/gulpfile.js b/gulpfile.js
index 7d64077..43f440b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -43,6 +43,11 @@ const webpackConfigModule = {
       use: {
         loader: 'babel-loader'
       }
+    },
+    {
+      test: /\.js$/,
+      use: ['source-map-loader'],
+      enforce: 'pre'
     }
   ]
 }
diff --git a/package-lock.json b/package-lock.json
index 52976fe..7f35086 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8633,6 +8633,27 @@
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
       "dev": true
     },
+    "source-map-loader": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+      "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+      "dev": true,
+      "requires": {
+        "async": "^2.5.0",
+        "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        }
+      }
+    },
     "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
diff --git a/package.json b/package.json
index 3a620df..b5c5ded 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "json-loader": "0.5.7",
     "mkdirp": "1.0.4",
     "mocha": "7.1.2",
+    "source-map-loader": "0.2.4",
     "standard": "14.3.3",
     "uglify-js": "3.9.1",
     "webpack": "4.43.0"