diff --git a/net/td-system-tools/Makefile b/net/td-system-tools/Makefile
index fb01bf2ac01e..f8f8a46714f1 100644
--- a/net/td-system-tools/Makefile
+++ b/net/td-system-tools/Makefile
@@ -1,18 +1,21 @@
 PORTNAME=	td-system-tools
-DISTVERSION=	1.5.6
+DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://www.nntb.no/~dreibh/system-tools/download/
 
 MAINTAINER=	thomas.dreibholz@gmail.com
 COMMENT=	Printing basic system information and system maintenance
 WWW=		https://www.nntb.no/~dreibh/system-tools/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		mbuffer:misc/mbuffer \
+		figlet:misc/figlet
 
-USES=		cmake tar:xz
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
+USES=		cmake gettext tar:xz
+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 
 .include <bsd.port.mk>
diff --git a/net/td-system-tools/distinfo b/net/td-system-tools/distinfo
index c16123701b9f..b497f3af4092 100644
--- a/net/td-system-tools/distinfo
+++ b/net/td-system-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707818231
-SHA256 (td-system-tools-1.5.6.tar.xz) = cd9d973ad8db4067e1e459f09734cac89c4fdc2fc193c0e4f42d495c9509a1e6
-SIZE (td-system-tools-1.5.6.tar.xz) = 117840
+TIMESTAMP = 1711879342
+SHA256 (td-system-tools-1.6.0.tar.xz) = 5b5fafb3d98bbaa27e52e6e59e35c750c58c88e4243605a66d63e32c0200e2c9
+SIZE (td-system-tools-1.6.0.tar.xz) = 129880
diff --git a/net/td-system-tools/files/patch-src_System-Info b/net/td-system-tools/files/patch-src_System-Info
new file mode 100644
index 000000000000..a7c98c161361
--- /dev/null
+++ b/net/td-system-tools/files/patch-src_System-Info
@@ -0,0 +1,8 @@
+--- src/System-Info.orig	2024-04-01 21:09:56 UTC
++++ src/System-Info
+@@ -374,4 +374,4 @@ print-network-addresses 2>&1 | (
+    wait
+    cat
+ ) | \
+-( buffer -s 16k || cat)
++( mbuffer -s 16k || cat)
diff --git a/net/td-system-tools/pkg-plist b/net/td-system-tools/pkg-plist
index e228cac4e578..ee2250b7186c 100644
--- a/net/td-system-tools/pkg-plist
+++ b/net/td-system-tools/pkg-plist
@@ -1,12 +1,21 @@
+bin/configure-grub
 bin/System-Info
 bin/System-Maintenance
-bin/configure-grub
-share/man/man1/System-Info.1.gz
-share/man/man1/System-Maintenance.1.gz
-share/man/man1/configure-grub.1.gz
 etc/profile.d/system-info.csh
 etc/profile.d/system-info.sh
 etc/system-info.d/01-example
+etc/system-info.d/banner-helper
 etc/system-maintenance.d/XX-example
 share/configure-grub/grub-defaults-nornet
 share/configure-grub/grub-defaults-standard
+share/locale/de/LC_MESSAGES/System-Info.mo
+share/locale/de/LC_MESSAGES/System-Maintenance.mo
+share/locale/nb/LC_MESSAGES/System-Info.mo
+share/locale/nb/LC_MESSAGES/System-Maintenance.mo
+share/man/man1/configure-grub.1.gz
+share/man/man1/System-Info.1.gz
+share/man/man1/System-Maintenance.1.gz
+share/System-Info/01-example
+share/System-Info/09-hostname-example
+share/System-Info/10-company-logo-example
+share/System-Info/banner-helper