diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile
index a83ad515d24e..757a7d24628e 100644
--- a/sysutils/uniutils/Makefile
+++ b/sysutils/uniutils/Makefile
@@ -1,44 +1,43 @@
 PORTNAME=	uniutils
-PORTVERSION=	2.27
-PORTREVISION=	2
+PORTVERSION=	2.28
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://billposer.org/Software/Downloads/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Unicode Description Utilities
 WWW=		https://billposer.org/Software/unidesc.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	ascii2binary:converters/ascii2binary
 
 GNU_CONFIGURE=	yes
-USES=		gettext localbase
+USES=		gettext localbase tar:bz2
 
 LIBS+=		-lintl
 
 TESTFILES=	Test1.ann Test1.u Test2.ann Test2.u Test3.ann Test3.u	\
 		Test4.ann Test4.u Test5.ann Test5.u
 PORTDOCS=	AUTHORS NEWS README
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-configure:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|TestData|${EXAMPLESDIR}|' ${WRKSRC}/README
 
 do-test:
 	(cd ${WRKSRC} &&		\
 	./unidesc TestData/Test1.u &&	\
 	./uniname TestData/Test1.ann)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${TESTFILES:S|^|${WRKSRC}/TestData/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/uniutils/distinfo b/sysutils/uniutils/distinfo
index 05d54cee5ae4..e9156033f78f 100644
--- a/sysutils/uniutils/distinfo
+++ b/sysutils/uniutils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (uniutils-2.27.tar.gz) = c662a9215a3a67aae60510f679135d479dbddaf90f5c85a3c5bab1c89da61596
-SIZE (uniutils-2.27.tar.gz) = 274303
+TIMESTAMP = 1699218799
+SHA256 (uniutils-2.28.tar.bz2) = d67bbc814e7ae8ccb1afc1e9081c6cbcd52510748c20ba1322caff2f9a5d917c
+SIZE (uniutils-2.28.tar.bz2) = 262845
diff --git a/sysutils/uniutils/files/patch-unifuzz.c b/sysutils/uniutils/files/patch-unifuzz.c
index 1cbf01b5fab0..f054ceb3ceb2 100644
--- a/sysutils/uniutils/files/patch-unifuzz.c
+++ b/sysutils/uniutils/files/patch-unifuzz.c
@@ -1,11 +1,11 @@
---- unifuzz.c.orig	2008-04-04 06:30:58.000000000 +0200
-+++ unifuzz.c	2013-09-05 09:50:49.000000000 +0200
-@@ -97,7 +97,7 @@
+--- unifuzz.c.orig	2020-11-20 08:28:53 UTC
++++ unifuzz.c
+@@ -97,7 +97,7 @@ EmitBadUTF8 () {
  }
  
  /* Emit the middle character from each range */
 -EmitAllRanges(short AboveBMPP) {
 +void EmitAllRanges(short AboveBMPP) {
    int i;
    UTF32 scp;
    extern int Ranges_Defined;
diff --git a/sysutils/uniutils/files/patch-unisurrogate.c b/sysutils/uniutils/files/patch-unisurrogate.c
new file mode 100644
index 000000000000..b3b9a231ebeb
--- /dev/null
+++ b/sysutils/uniutils/files/patch-unisurrogate.c
@@ -0,0 +1,8 @@
+--- unisurrogate.c.orig	2020-11-20 08:28:53 UTC
++++ unisurrogate.c
+@@ -1,4 +1,5 @@
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include "config.h"
diff --git a/sysutils/uniutils/pkg-descr b/sysutils/uniutils/pkg-descr
index 40f75ea92f4f..56185f565aa9 100644
--- a/sysutils/uniutils/pkg-descr
+++ b/sysutils/uniutils/pkg-descr
@@ -1,21 +1,24 @@
-Uniutils consists of five programs for finding out what is in a Unicode file.
+Uniutils consists of six programs for finding out what is in a Unicode file.
 They are useful when working with Unicode files when one doesn't know the
 writing system, doesn't have the necessary font, needs to inspect invisible
 characters, needs to find out whether characters have been combined or in what
 order they occur, or needs statistics on which characters occur.
 
 uniname defaults to printing the character offset of each character, its byte
 offset, its hex code value, its encoding, the glyph itself, and its name.
 
 unidesc reports the character ranges to which different portions of the text
 belong. It can also be used to identify Unicode encodings (e.g. UTF-16be)
 flagged by magic numbers.
 
 unihist generates a histogram of the characters in its input, which must be
 encoded in UTF-8 Unicode.
 
 ExplicateUTF8 is intended for debugging or for learning about Unicode. It
 determines and explains the validity of a sequence of bytes as a UTF8 encoding.
 
 Unirev is a filter that reverses UTF-8 strings character-by-character (as
 opposed to byte-by-byte).
+
+Unisurrogate takes a codepoint on the command line and, if it falls outside the
+BMP, reports its surrogate decomposition.
diff --git a/sysutils/uniutils/pkg-plist b/sysutils/uniutils/pkg-plist
index 408f041f3228..63df5e3cf5d4 100644
--- a/sysutils/uniutils/pkg-plist
+++ b/sysutils/uniutils/pkg-plist
@@ -1,23 +1,25 @@
 bin/ExplicateUTF8
 bin/unidesc
 bin/unifuzz
 bin/unihist
 bin/uniname
 bin/unireverse
+bin/unisurrogate
 bin/utf8lookup
 man/man1/ExplicateUTF8.1.gz
 man/man1/unidesc.1.gz
 man/man1/unifuzz.1.gz
 man/man1/unihist.1.gz
 man/man1/uniname.1.gz
 man/man1/unireverse.1.gz
+man/man1/unisurrogate.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test1.ann
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test1.u
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test2.ann
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test2.u
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test3.ann
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test3.u
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test4.ann
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test4.u
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test5.ann
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Test5.u