diff --git a/apps/Puffin/credits b/apps/Puffin/credits
new file mode 100644
index 0000000000..5e21fe8066
--- /dev/null
+++ b/apps/Puffin/credits
@@ -0,0 +1 @@
+Botspot added this app to Pi-Apps.
diff --git a/apps/Puffin/description b/apps/Puffin/description
new file mode 100644
index 0000000000..24d84aa14f
--- /dev/null
+++ b/apps/Puffin/description
@@ -0,0 +1,9 @@
+Speeds up web browsing thanks to cloud servers.
+This web browser uses cloud servers to load websites for you, instead of making your system do it all. Result: a claimed 1600% browsing speed increase.
+Please note that Puffin is a pretty bad browser now, and uses such an old Google Chrome that it fails to load many common websites correctly. Additionally, Puffin's cloud servers can probably see everything you are looking at, so try to avoid giving it any sensitive data.
+Puffin is probably best used sparingly only on systems with low RAM, such as the Pi Zero 2 or Pi 3. It can also be useful for reaching websites forbidden by your local network, since browsing traffic is handled on Puffin's servers.
+
+Also don't be surprised if we at Pi-Apps decide to remove Puffin in the future. But for now it still works on 64-bit ARM systems at least. (32-bit support broke in late 2024)
+
+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
new file mode 100644
index 0000000000..38a3b3dddb
Binary files /dev/null and b/apps/Puffin/icon-24.png differ
diff --git a/apps/Puffin/icon-64.png b/apps/Puffin/icon-64.png
new file mode 100644
index 0000000000..d24b979b24
Binary files /dev/null and b/apps/Puffin/icon-64.png differ
diff --git a/apps/Puffin/install-64 b/apps/Puffin/install-64
new file mode 100755
index 0000000000..e8ca3026e5
--- /dev/null
+++ b/apps/Puffin/install-64
@@ -0,0 +1,8 @@
+#!/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
+
+warning "Puffin is a pretty bad browser. Please be sure to read the Pi-Apps descripton for this app to see why. If you use Puffin a lot, try to find a different browser that works for you."
+install_packages https://download.puffinbrowser.com/repo/pool/stable/arm64/puffin-internet-terminal-demo_8.2.4.705_arm64.deb || exit 1
+warning "Puffin is a pretty bad browser. Please be sure to read the Pi-Apps descripton for this app to see why. If you use Puffin a lot, try to find a different browser that works for you."
diff --git a/apps/Puffin/uninstall b/apps/Puffin/uninstall
new file mode 100755
index 0000000000..b74a15cd56
--- /dev/null
+++ b/apps/Puffin/uninstall
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 0000000000..6ff9ae1802
--- /dev/null
+++ b/apps/Puffin/website
@@ -0,0 +1 @@
+https://www.puffin.com/raspberry-pi/
diff --git a/etc/categories b/etc/categories
index 0729f590dd..dba1c4d0f6 100644
--- a/etc/categories
+++ b/etc/categories
@@ -147,6 +147,7 @@ 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 ac6213a695..0a30174793 100755
--- a/etc/runonce-entries
+++ b/etc/runonce-entries
@@ -93,7 +93,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."
+  remove_deprecated_app "Puffin" "32" "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."
   remove_deprecated_app "Puffin Browser Demo" "" "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."
   remove_deprecated_app "ExaGear"
   remove_deprecated_app "Mac OS Theme"