diff --git a/Meta/lint-ports.py b/Meta/lint-ports.py
index 8427991216a..e3e42a1ea17 100755
--- a/Meta/lint-ports.py
+++ b/Meta/lint-ports.py
@@ -61,7 +61,6 @@ PORTS_MISSING_DESCRIPTIONS = {
     'harfbuzz',
     'indent',
     'jq',
-    'klong',
     'libassuan',
     'libgcrypt',
     'libgd',
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index dd66b65147c..e543ea0cd6b 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -83,7 +83,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
 | [`ja2`](ja2/)                          | Jagged Alliance 2 Stracciatella                                 | 0.15.x                   | https://github.com/safarp/ja2-stracciatella/tree/0.15.x                        |
 | [`jot`](jot/)                          | jot (OpenBSD)                                                   | 6.6                      | https://github.com/ibara/libpuffy                                              |
 | [`jq`](jq/)                            | jq                                                              | 1.6                      | https://stedolan.github.io/jq/                                                 |
-| [`klong`](klong/)                      | Klong                                                           | 20190926                 | https://t3x.org/klong/                                                         |
+| [`klong`](klong/)                      | Klong                                                           | 20220315                 | https://t3x.org/klong/                                                         |
 | [`less`](less/)                        | less                                                            | 590                      | https://www.greenwoodsoftware.com/less/                                        |
 | [`libarchive`](libarchive/)            | libarchive                                                      | 3.5.2                    | https://libarchive.org/                                                        |
 | [`libassuan`](libassuan/)              | libassuan                                                       | 2.5.5                    | https://gnupg.org/software/libassuan/index.html                                |
diff --git a/Ports/klong/package.sh b/Ports/klong/package.sh
index 2b277a20475..a1f89535beb 100755
--- a/Ports/klong/package.sh
+++ b/Ports/klong/package.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=klong
-version=20190926
-files="http://t3x.org/klong/klong20190926.tgz klong20190926.tgz 98009744f2200fc34d94b129590bbe52de1d330acbdb7c28e36d34a5cb30dc48"
+version=20220315
+files="http://t3x.org/klong/klong${version}.tgz klong${version}.tgz 018b75ca2b2ee86eabc9ac3b6c14b0a2aa9200998d4d860e04432fdc80285191"
 auth_type=sha256
 useconfigure=false
 workdir=klong
diff --git a/Ports/klong/patches/0001-Patch-Makefile.patch b/Ports/klong/patches/0001-Patch-Makefile.patch
new file mode 100644
index 00000000000..a28461deabf
--- /dev/null
+++ b/Ports/klong/patches/0001-Patch-Makefile.patch
@@ -0,0 +1,44 @@
+From 63f3b49119e29d905a66c64895625c702b4827d5 Mon Sep 17 00:00:00 2001
+From: EWouters <6179932+EWouters@users.noreply.github.com>
+Date: Tue, 5 Apr 2022 14:33:34 +0200
+Subject: [PATCH] Patch Makefile
+
+- Make `CC` configurable from `env`
+- Remove `klong.image` target from all
+- Add install target
+---
+ Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f692ff7..470adcd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ CFLAGS=	-g -Wall -pedantic -O3
+-CC=	cc $(CFLAGS)
++CC:=	$(CC) $(CFLAGS)
+ V=	20211014
+ R=	20220315
+ 
+@@ -12,7 +12,7 @@ OPTIONS= -DEDIT
+ # Modules to load into image file
+ MODULES=-l nstat -l nplot -l time
+ 
+-all:	kg klong.image
++all:	kg
+ 
+ klong.image:	kg
+ 	./kg -n $(MODULES) -o klong.image
+@@ -54,3 +54,8 @@ csums:
+ 
+ mksums:	clean
+ 	find . -type f | grep -v _csums | grep -v klong2015 | csum >_csums
++
++install:
++	install kg ${DESTDIR}/usr/local/bin
++	mkdir -p ${DESTDIR}/usr/local/lib/klong
++	install -m 644 lib/* ${DESTDIR}/usr/local/lib/klong
+-- 
+2.32.0 (Apple Git-132)
+
diff --git a/Ports/klong/patches/ReadMe.md b/Ports/klong/patches/ReadMe.md
new file mode 100644
index 00000000000..88010a04f1a
--- /dev/null
+++ b/Ports/klong/patches/ReadMe.md
@@ -0,0 +1,10 @@
+# Patches for klong on SerenityOS
+
+## `0001-Patch-Makefile.patch`
+
+Patch Makefile
+
+- Make `CC` configurable from `env`
+- Remove `klong.image` target from all
+- Add install target
+
diff --git a/Ports/klong/patches/klong.patch b/Ports/klong/patches/klong.patch
deleted file mode 100644
index 3008222f098..00000000000
--- a/Ports/klong/patches/klong.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- klong/Makefile.orig	2019-10-01 13:06:39.000000000 +0200
-+++ klong/Makefile	2020-02-01 21:08:13.020202542 +0100
-@@ -1,12 +1,12 @@
- CFLAGS=	-g -Wall -pedantic -O3
--CC=	cc $(CFLAGS)
-+CC:=	$(CC) $(CFLAGS)
- V=	20190330
- R=	20190926
-
- # Modules to load into image file
- OPTIONS=-l nstat -l nplot -l time
-
--all:	kg klong.image
-+all:	kg
-
- klong.image:	kg
- 	./kg -n $(OPTIONS) -o klong.image
-@@ -48,3 +48,8 @@
-
- mksums:	clean
- 	find . -type f | grep -v _csums | grep -v klong2015 | csum >_csums
-+
-+install:
-+	install kg ${DESTDIR}/usr/local/bin
-+	mkdir -p ${DESTDIR}/usr/local/lib/klong
-+	install -m 644 lib/* ${DESTDIR}/usr/local/lib/klong