diff --git a/components.d.ts b/components.d.ts
index e31119b3..eee63646 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -144,6 +144,7 @@ declare module '@vue/runtime-core' {
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
+    NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
@@ -152,6 +153,7 @@ declare module '@vue/runtime-core' {
     PdfSignatureDetails: typeof import('./src/tools/pdf-signature-checker/components/pdf-signature-details.vue')['default']
     PercentageCalculator: typeof import('./src/tools/percentage-calculator/percentage-calculator.vue')['default']
     PhoneParserAndFormatter: typeof import('./src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue')['default']
+    PortNumbers: typeof import('./src/tools/port-numbers/port-numbers.vue')['default']
     QrCodeGenerator: typeof import('./src/tools/qr-code-generator/qr-code-generator.vue')['default']
     RandomPortGenerator: typeof import('./src/tools/random-port-generator/random-port-generator.vue')['default']
     ResultRow: typeof import('./src/tools/ipv4-range-expander/result-row.vue')['default']
@@ -159,6 +161,7 @@ declare module '@vue/runtime-core' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     RsaKeyPairGenerator: typeof import('./src/tools/rsa-key-pair-generator/rsa-key-pair-generator.vue')['default']
+    SafelinkDecoder: typeof import('./src/tools/safelink-decoder/safelink-decoder.vue')['default']
     SlugifyString: typeof import('./src/tools/slugify-string/slugify-string.vue')['default']
     SpanCopyable: typeof import('./src/components/SpanCopyable.vue')['default']
     SqlPrettify: typeof import('./src/tools/sql-prettify/sql-prettify.vue')['default']
diff --git a/package.json b/package.json
index fd6c02e6..fcd0b67e 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
     "pdf-signature-reader": "^1.4.2",
     "pinia": "^2.0.34",
     "plausible-tracker": "^0.3.8",
+    "port-numbers": "^8.0.11",
     "qrcode": "^1.5.1",
     "sql-formatter": "^13.0.0",
     "ua-parser-js": "^1.0.35",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd6c38c9..3b509f48 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,6 +137,9 @@ dependencies:
   plausible-tracker:
     specifier: ^0.3.8
     version: 0.3.8
+  port-numbers:
+    specifier: ^8.0.11
+    version: 8.0.11
   qrcode:
     specifier: ^1.5.1
     version: 1.5.1
@@ -3351,7 +3354,7 @@ packages:
     dependencies:
       '@unhead/dom': 0.5.1
       '@unhead/schema': 0.5.1
-      '@vueuse/shared': 10.7.2(vue@3.3.4)
+      '@vueuse/shared': 10.9.0(vue@3.3.4)
       unhead: 0.5.1
       vue: 3.3.4
     transitivePeerDependencies:
@@ -3993,10 +3996,10 @@ packages:
       - vue
     dev: false
 
-  /@vueuse/shared@10.7.2(vue@3.3.4):
-    resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==}
+  /@vueuse/shared@10.9.0(vue@3.3.4):
+    resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==}
     dependencies:
-      vue-demi: 0.14.6(vue@3.3.4)
+      vue-demi: 0.14.7(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -7429,6 +7432,10 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: false
 
+  /port-numbers@8.0.11:
+    resolution: {integrity: sha512-2iZBdCzSZea7GIDpVecH0fIN1b55d7+YxjMAJ+9tgdD80FdR7v60BF23tm9yQ7VZpu91yLiHmqp75oAnYYYXnw==}
+    dev: false
+
   /postcss-selector-parser@6.0.13:
     resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==}
     engines: {node: '>=4'}
@@ -9151,8 +9158,8 @@ packages:
       vue: 3.3.4
     dev: false
 
-  /vue-demi@0.14.6(vue@3.3.4):
-    resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
+  /vue-demi@0.14.7(vue@3.3.4):
+    resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
@@ -9442,6 +9449,7 @@ packages:
 
   /workbox-google-analytics@7.0.0:
     resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
     dependencies:
       workbox-background-sync: 7.0.0
       workbox-core: 7.0.0
diff --git a/src/tools/index.ts b/src/tools/index.ts
index aa861c93..835f7b67 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -6,6 +6,7 @@ import { tool as asciiTextDrawer } from './ascii-text-drawer';
 
 import { tool as textToUnicode } from './text-to-unicode';
 import { tool as safelinkDecoder } from './safelink-decoder';
+import { tool as portNumbers } from './port-numbers';
 import { tool as pdfSignatureChecker } from './pdf-signature-checker';
 import { tool as numeronymGenerator } from './numeronym-generator';
 import { tool as macAddressGenerator } from './mac-address-generator';
@@ -152,7 +153,15 @@ export const toolsByCategory: ToolCategory[] = [
   },
   {
     name: 'Network',
-    components: [ipv4SubnetCalculator, ipv4AddressConverter, ipv4RangeExpander, macAddressLookup, macAddressGenerator, ipv6UlaGenerator],
+    components: [
+      ipv4SubnetCalculator,
+      ipv4AddressConverter,
+      ipv4RangeExpander,
+      macAddressLookup,
+      macAddressGenerator,
+      ipv6UlaGenerator,
+      portNumbers,
+    ],
   },
   {
     name: 'Math',
diff --git a/src/tools/port-numbers/index.ts b/src/tools/port-numbers/index.ts
new file mode 100644
index 00000000..5eff7d3e
--- /dev/null
+++ b/src/tools/port-numbers/index.ts
@@ -0,0 +1,12 @@
+import { PlugConnected } from '@vicons/tabler';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'Port Numbers',
+  path: '/port-numbers',
+  description: 'Search for assigned usage of a given port and protocol',
+  keywords: ['port', 'tcp', 'udp', 'protocol'],
+  component: () => import('./port-numbers.vue'),
+  icon: PlugConnected,
+  createdAt: new Date('2024-04-20'),
+});
diff --git a/src/tools/port-numbers/port-numbers.vue b/src/tools/port-numbers/port-numbers.vue
new file mode 100644
index 00000000..17217efa
--- /dev/null
+++ b/src/tools/port-numbers/port-numbers.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import ports from 'port-numbers';
+import SpanCopyable from '@/components/SpanCopyable.vue';
+
+const port = ref(80);
+const protocol = ref('tcp');
+const result = computed(() => {
+  const [type, description] = ports[`${port.value}/${protocol.value}` as (keyof typeof ports)];
+  return { type: type ?? 'unknown', description: description ?? 'Unknown' };
+});
+</script>
+
+<template>
+  <div>
+    <c-card title="Port search">
+      <n-space>
+        <n-form-item label="Port number">
+          <n-input-number v-model:value="port" :min="1" />
+        </n-form-item>
+        <n-form-item label="Protocol">
+          <c-select
+            v-model:value="protocol"
+            :options="[{ value: 'tcp', label: 'TCP' }, { value: 'udp', label: 'UDP' }]"
+          />
+        </n-form-item>
+      </n-space>
+    </c-card>
+
+    <c-card>
+      <n-form-item label="Type">
+        <SpanCopyable :value="result?.type" />
+      </n-form-item>
+      <n-form-item label="Description">
+        <SpanCopyable :value="result?.description" />
+      </n-form-item>
+    </c-card>
+  </div>
+</template>