diff --git a/rollup.config.js b/rollup.config.js
index 312658583..37b7e4ec1 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -14,6 +14,7 @@ let coreDependencies = {
     'primevue/api': 'primevue.api',
     'primevue/config': 'primevue.config',
     'primevue/ripple': 'primevue.ripple',
+    'primevue/tooltip': 'primevue.tooltip',
     'primevue/virtualscroller': 'primevue.virtualscroller',
     'primevue/confirmationeventbus': 'primevue.confirmationeventbus',
     'primevue/toasteventbus': 'primevue.toasteventbus',
diff --git a/src/components/dock/DockSub.vue b/src/components/dock/DockSub.vue
index 1a72683ed..320e5ba0e 100644
--- a/src/components/dock/DockSub.vue
+++ b/src/components/dock/DockSub.vue
@@ -28,6 +28,7 @@
 
 <script>
 import Ripple from 'primevue/ripple';
+import Tooltip from 'primevue/tooltip';
 
 export default {
     name: 'DockSub',
@@ -96,7 +97,8 @@ export default {
         }
     },
     directives: {
-        'ripple': Ripple
+        'ripple': Ripple,
+        'tooltip': Tooltip
     }
 }
 </script>
diff --git a/src/components/speeddial/SpeedDial.vue b/src/components/speeddial/SpeedDial.vue
index 0600c9b39..8c7f75e09 100644
--- a/src/components/speeddial/SpeedDial.vue
+++ b/src/components/speeddial/SpeedDial.vue
@@ -23,6 +23,7 @@
 <script>
 import Button from 'primevue/button';
 import Ripple from 'primevue/ripple';
+import Tooltip from 'primevue/tooltip';
 import {DomHandler} from 'primevue/utils';
 
 export default {
@@ -262,7 +263,8 @@ export default {
         'SDButton': Button
     },
     directives: {
-        'ripple': Ripple
+        'ripple': Ripple,
+        'tooltip': Tooltip
     }
 }
 </script>
diff --git a/src/views/datatable/DataTableFilterDemo.vue b/src/views/datatable/DataTableFilterDemo.vue
index a26d9749b..5e3b0edbc 100755
--- a/src/views/datatable/DataTableFilterDemo.vue
+++ b/src/views/datatable/DataTableFilterDemo.vue
@@ -948,7 +948,6 @@ export default {
         <script src="https://unpkg.com/primevue@^3/progressbar/progressbar.min.js"><\\/script>
         <script src="https://unpkg.com/primevue@^3/tristatecheckbox/tristatecheckbox.min.js"><\\/script>
         <script src="https://unpkg.com/primevue@^3/slider/slider.min.js"><\\/script>
-        <script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"><\\/script>
         <script src="./CustomerService.js"><\\/script>`,
                     content: `<div id="app">
             <div class="card">
diff --git a/src/views/dock/DockDoc.vue b/src/views/dock/DockDoc.vue
index ca21e420d..8dcbedaea 100644
--- a/src/views/dock/DockDoc.vue
+++ b/src/views/dock/DockDoc.vue
@@ -1012,7 +1012,6 @@ export default {
         <script src="https://unpkg.com/primevue@^3/menubar/menubar.min.js"><\\/script>
         <script src="https://unpkg.com/primevue@^3/terminal/terminal.min.js"><\\/script>
         <script src="https://unpkg.com/primevue@^3/galleria/galleria.min.js"><\\/script>
-        <script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"><\\/script>
         <script src="./NodeService.js"><\\/script>
         <script src="./PhotoService.js"><\\/script>`,
                     content: `<div id="app" class="dock-demo">
diff --git a/src/views/editor/EditorDoc.vue b/src/views/editor/EditorDoc.vue
index 049c995e4..3ec72fc97 100755
--- a/src/views/editor/EditorDoc.vue
+++ b/src/views/editor/EditorDoc.vue
@@ -244,8 +244,7 @@ export default {
                     tabName: 'Browser Source',
                     imports: `<script src="https://unpkg.com/quill/dist/quill.min.js"><\\/script>
                     
-        <script src="https://unpkg.com/primevue@^3/editor/editor.min.js"><\\/script>
-        <script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"><\\/script>`,
+        <script src="https://unpkg.com/primevue@^3/editor/editor.min.js"><\\/script>`,
                     content: `<div id="app">
             <h5>Default</h5>
             <p-editor v-model="value1" editor-style="height: 320px"></p-editor>
diff --git a/src/views/speeddial/SpeedDialDoc.vue b/src/views/speeddial/SpeedDialDoc.vue
index 0864cd368..aa765942f 100644
--- a/src/views/speeddial/SpeedDialDoc.vue
+++ b/src/views/speeddial/SpeedDialDoc.vue
@@ -717,8 +717,7 @@ export default {
                     tabName: 'Browser Source',
                     imports: `<script src="https://unpkg.com/primevue@^3/speeddial/speeddial.min.js"><\\/script>
         <script src="https://unpkg.com/primevue@^3/toast/toast.min.js"><\\/script>
-        <script src="https://unpkg.com/primevue@^3/toastservice/toastservice.min.js"><\\/script>
-        <script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"><\\/script>`,
+        <script src="https://unpkg.com/primevue@^3/toastservice/toastservice.min.js"><\\/script>`,
                     content: `<div id="app">
             <p-toast></p-toast>
             <div class="card">
diff --git a/src/views/tooltip/TooltipDoc.vue b/src/views/tooltip/TooltipDoc.vue
index 7649108dd..c17d56456 100755
--- a/src/views/tooltip/TooltipDoc.vue
+++ b/src/views/tooltip/TooltipDoc.vue
@@ -12,7 +12,6 @@ app.directive('tooltip', Tooltip);
         <h5>Import via CDN</h5>
 <pre v-code><code>
 &lt;script src="https://unpkg.com/primevue@^3/core/core.min.js"&gt;&lt;/script&gt;
-&lt;script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"&gt;&lt;/script&gt;
 
 </code></pre>
 
@@ -229,7 +228,6 @@ export default {
                 },
                 'browser-source': {
                     tabName: 'Browser Source',
-                    imports: `<script src="https://unpkg.com/primevue@^3/tooltip/tooltip.min.js"><\\/script>`,
                     content: `<div id="app">
             <h5>Positions</h5>
             <div class="grid p-fluid">
diff --git a/vue.config.js b/vue.config.js
index d301902ab..92cccb096 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,6 +7,7 @@ module.exports = {
         resolve: {
             alias: {
                 'primevue/ripple': path.resolve(__dirname, 'src/components/ripple/Ripple.js'),
+                'primevue/tooltip': path.resolve(__dirname, 'src/components/tooltip/Tooltip.js'),
                 'primevue/useconfirm': path.resolve(__dirname, 'src/components/useconfirm/UseConfirm.js'),
                 'primevue/usetoast': path.resolve(__dirname, 'src/components/usetoast/UseToast.js'),
                 'primevue/utils': path.resolve(__dirname, 'src/components/utils/Utils.js'),