diff --git a/apps/Puffin/credits b/apps/Puffin/credits
deleted file mode 100644
index 5e21fe8066..0000000000
--- a/apps/Puffin/credits
+++ /dev/null
@@ -1 +0,0 @@
-Botspot added this app to Pi-Apps.
diff --git a/apps/Puffin/description b/apps/Puffin/description
deleted file mode 100644
index 4482843294..0000000000
--- a/apps/Puffin/description
+++ /dev/null
@@ -1,6 +0,0 @@
-Speeds up web browsing thanks to cloud servers.
-This web browser uses cloud servers to load websites for you, instead of making your Pi do it all.
-Result: a claimed 1600% browsing speed increase.
-
-To run: Menu -> Internet -> Puffin Internet Terminal (Demo)
-To run in a terminal: puffin-internet-terminal-demo
diff --git a/apps/Puffin/icon-24.png b/apps/Puffin/icon-24.png
deleted file mode 100644
index 38a3b3dddb..0000000000
Binary files a/apps/Puffin/icon-24.png and /dev/null differ
diff --git a/apps/Puffin/icon-64.png b/apps/Puffin/icon-64.png
deleted file mode 100644
index d24b979b24..0000000000
Binary files a/apps/Puffin/icon-64.png and /dev/null differ
diff --git a/apps/Puffin/install-32 b/apps/Puffin/install-32
deleted file mode 100755
index 96cfb595ce..0000000000
--- a/apps/Puffin/install-32
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-install_packages https://download.puffinbrowser.com/linux/raspbian/puffin-internet-terminal-demo_8.2.4.705_armhf.deb || exit 1
-
diff --git a/apps/Puffin/install-64 b/apps/Puffin/install-64
deleted file mode 100755
index 3d0a3b29d9..0000000000
--- a/apps/Puffin/install-64
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#Thanks to GitHub user @ZhymabekRoman for pointing out that Puffin has secret Linux amd64, i386, and arm64 releases on their repo.
-# https://github.com/ZhymabekRoman/Puffin-Browser-on-Linux/issues/2
-
-install_packages https://download.puffinbrowser.com/repo/pool/stable/arm64/puffin-internet-terminal-demo_8.2.4.705_arm64.deb || exit 1
-
diff --git a/apps/Puffin/uninstall b/apps/Puffin/uninstall
deleted file mode 100755
index b74a15cd56..0000000000
--- a/apps/Puffin/uninstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-sudo apt purge -y puffin-internet-terminal-demo
-sudo apt purge -y puffin-internet-terminal
-sudo rm -f /etc/apt/sources.list.d/puffin-internet-terminal.list
diff --git a/apps/Puffin/website b/apps/Puffin/website
deleted file mode 100644
index 6ff9ae1802..0000000000
--- a/apps/Puffin/website
+++ /dev/null
@@ -1 +0,0 @@
-https://www.puffin.com/raspberry-pi/
diff --git a/etc/categories b/etc/categories
index 2dadfcda87..96598b117b 100644
--- a/etc/categories
+++ b/etc/categories
@@ -161,7 +161,6 @@ Processing IDE|Programming
 ProjectLibre|Office
 Project OutFox|Games
 PrusaSlicer|Engineering
-Puffin|Internet/Browsers
 Pycharm CE|Programming
 PyChess|Games
 QEMU|Tools/Emulation
diff --git a/etc/runonce-entries b/etc/runonce-entries
index 2c4625c4b1..ac753aa834 100755
--- a/etc/runonce-entries
+++ b/etc/runonce-entries
@@ -92,6 +92,7 @@ For the mods that are not included in any existing modpack, simply install them
 You can install the Snap Store from Pi-Apps on a 64bit OS."
   remove_deprecated_app "BalenaEtcher" "32" "The latest version of BalenaEtcher relies on libraries that are not available on ARM 32bit Linux.
 You can install BalenaEtcher from Pi-Apps on a 64bit OS."
+  remove_deprecated_app "Puffin" "" "The Puffin browser demo was never maintained by the upstream developers. It can not run on newer raspberry pi hardware, newer PiOS versions, and any other hardware. We have no choice but to remove this application from Pi-Apps."
   true
 EOF
   ;;