diff --git a/.airtap.yml b/.airtap.yml
deleted file mode 100644
index e76fa749b..000000000
--- a/.airtap.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-providers:
-  - airtap-playwright
-ui: mocha-bdd
-browsers:
-  - name: chromium
-    supports:
-      headless: true
-
diff --git a/README.md b/README.md
index 9651eb0f0..bb10453c7 100644
--- a/README.md
+++ b/README.md
@@ -801,6 +801,8 @@ The callback is called when the packet has been removed.
 Closes the Store.
 
 <a name="browser"></a>
+<a name="webpack"></a>
+<a name="vite"></a>
 
 ## Browser
 
@@ -812,7 +814,15 @@ You can find all mqtt bundles versions in `dist` folder:
 - `mqtt.min.js` - iife format, minified
 - `mqtt.esm.js` - esm format minified
 
-In order to import them use one of the following:
+Starting from MQTT.js > 5.2.0 you can import mqtt in your code like this:
+
+```js
+import mqtt from 'mqtt'
+```
+
+This will be automatically handled by your bundler.
+
+Otherwise you can choose to use a specific bundle like:
 
 ```js
 import * as mqtt from 'mqtt/dist/mqtt'
@@ -830,30 +840,6 @@ See <http://unpkg.com> for the full documentation on version ranges.
 
 **Be sure to only use this bundle with `ws` or `wss` URLs in the browser. Others URL types will likey fail**
 
-<a name="webpack"></a>
-
-### Webpack
-
-If you are using webpack simply import MQTT.js in one of the following ways:
-
-```js
-import * as mqtt from 'mqtt/dist/mqtt'
-import * as mqtt from 'mqtt/dist/mqtt.min'
-import mqtt from 'mqtt/dist/mqtt.esm'
-```
-
-<a name="vite"></a>
-
-### Vite
-
-If you are using vite simply import MQTT.js like this:
-
-```js
-import * as mqtt from 'mqtt/dist/mqtt'
-import * as mqtt from 'mqtt/dist/mqtt.min'
-import mqtt from 'mqtt/dist/mqtt.esm'
-```
-
 <a name="qos"></a>
 
 ## About QoS
diff --git a/examples/vite-example/src/App.vue b/examples/vite-example/src/App.vue
index d495e5d1f..668c34a70 100644
--- a/examples/vite-example/src/App.vue
+++ b/examples/vite-example/src/App.vue
@@ -1,10 +1,12 @@
 <script setup>
 import { ref } from 'vue'
-import { connect } from 'mqtt/dist/mqtt.min'
+import mqtt from 'mqtt'
+
+console.log('mqtt', mqtt)
 
 const connected = ref(false)
 
-const client = connect('wss://test.mosquitto.org:8081');
+const client = mqtt.connect('wss://test.mosquitto.org:8081');
 
 const messages = ref([])
 
diff --git a/package-lock.json b/package-lock.json
index 34af24e04..50c03e011 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
         "help-me": "^4.2.0",
         "lru-cache": "^10.0.1",
         "minimist": "^1.2.8",
+        "mqtt": "^5.2.0",
         "mqtt-packet": "^9.0.0",
         "number-allocator": "^1.0.14",
         "readable-stream": "^4.4.2",
@@ -11343,6 +11344,37 @@
         "node": ">= 8"
       }
     },
+    "node_modules/mqtt": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.2.0.tgz",
+      "integrity": "sha512-IyMUQlUvf1bQodxL7qApSVKv/ILqNyqAJkE45C6CegO4yuGIHu8Yig5EdyaoADa5ietLU1jUZ1LOfDVckTYkJw==",
+      "dependencies": {
+        "@types/readable-stream": "^4.0.5",
+        "@types/ws": "^8.5.9",
+        "commist": "^3.2.0",
+        "concat-stream": "^2.0.0",
+        "debug": "^4.3.4",
+        "duplexify": "^4.1.2",
+        "help-me": "^4.2.0",
+        "lru-cache": "^10.0.1",
+        "minimist": "^1.2.8",
+        "mqtt-packet": "^9.0.0",
+        "number-allocator": "^1.0.14",
+        "readable-stream": "^4.4.2",
+        "reinterval": "^1.1.0",
+        "rfdc": "^1.3.0",
+        "split2": "^4.2.0",
+        "ws": "^8.14.2"
+      },
+      "bin": {
+        "mqtt": "build/bin/mqtt.js",
+        "mqtt_pub": "build/bin/pub.js",
+        "mqtt_sub": "build/bin/sub.js"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/mqtt-connection": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-4.1.0.tgz",
@@ -25533,6 +25565,29 @@
         }
       }
     },
+    "mqtt": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.2.0.tgz",
+      "integrity": "sha512-IyMUQlUvf1bQodxL7qApSVKv/ILqNyqAJkE45C6CegO4yuGIHu8Yig5EdyaoADa5ietLU1jUZ1LOfDVckTYkJw==",
+      "requires": {
+        "@types/readable-stream": "^4.0.5",
+        "@types/ws": "^8.5.9",
+        "commist": "^3.2.0",
+        "concat-stream": "^2.0.0",
+        "debug": "^4.3.4",
+        "duplexify": "^4.1.2",
+        "help-me": "^4.2.0",
+        "lru-cache": "^10.0.1",
+        "minimist": "^1.2.8",
+        "mqtt-packet": "^9.0.0",
+        "number-allocator": "^1.0.14",
+        "readable-stream": "^4.4.2",
+        "reinterval": "^1.1.0",
+        "rfdc": "^1.3.0",
+        "split2": "^4.2.0",
+        "ws": "^8.14.2"
+      }
+    },
     "mqtt-connection": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-4.1.0.tgz",
diff --git a/package.json b/package.json
index 54f5c433b..b4daebb1a 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "url": "git://github.com/mqttjs/MQTT.js.git"
   },
   "main": "./build/mqtt.js",
+  "module": "./dist/mqtt.esm.js",
   "bin": {
     "mqtt_pub": "./build/bin/pub.js",
     "mqtt_sub": "./build/bin/sub.js",
@@ -35,7 +36,13 @@
     "src/"
   ],
   "exports": {
-    ".": "./build/mqtt.js",
+    ".": {
+      "browser": {
+        "import": "./dist/mqtt.esm.js", 
+        "default": "./dist/mqtt.js"
+      },
+      "default": "./build/mqtt.js"
+    },
     "./package.json": "./package.json",
     "./*.map": "./build/*.js.map",
     "./dist/*": "./dist/*.js",
@@ -95,7 +102,7 @@
     "node": ">=16.0.0"
   },
   "browser": {
-    "./mqtt.js": "./build/mqtt.js",
+    "./mqtt.js": "./dist/mqtt.js",
     "fs": false,
     "tls": false,
     "net": false
@@ -110,6 +117,7 @@
     "help-me": "^4.2.0",
     "lru-cache": "^10.0.1",
     "minimist": "^1.2.8",
+    "mqtt": "^5.2.0",
     "mqtt-packet": "^9.0.0",
     "number-allocator": "^1.0.14",
     "readable-stream": "^4.4.2",
diff --git a/test/browser/test.js b/test/browser/test.js
index aae2edbd3..ce73eb0ed 100644
--- a/test/browser/test.js
+++ b/test/browser/test.js
@@ -1,5 +1,5 @@
 import { expect } from '@esm-bundle/chai';
-import mqtt from '../../dist/mqtt.esm.js';
+import mqtt from '../../'; // this will resolve to mqtt/dist/mqtt.esm.js
 
 // needed to test no-esm version /dist/mqtt.js
 /** @type { import('../../src/mqtt').MqttClient }*/