diff --git a/textproc/linuxdoc-tools/Makefile b/textproc/linuxdoc-tools/Makefile
index f6bf287274d0..9305e1475cb7 100644
--- a/textproc/linuxdoc-tools/Makefile
+++ b/textproc/linuxdoc-tools/Makefile
@@ -1,39 +1,43 @@
 PORTNAME=	linuxdoc-tools
 DISTVERSION=	0.9.83
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fork of SGML-tools specially tailored for linuxdoc SGMLs
 WWW=		https://gitlab.com/agmartin/linuxdoc-tools
 
 LICENSE=	GPLv3 LinuxdocTools
 LICENSE_COMB=	multi
 LICENSE_NAME_LinuxdocTools=	The linuxdoc-tools license
 LICENSE_FILE_LinuxdocTools=	${WRKSRC}/COPYING
 LICENSE_PERMS_LinuxdocTools=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	gawk:lang/gawk \
 		nsgmls:textproc/jade \
 		sgmlsasp:textproc/sgmls
 RUN_DEPENDS=	gawk:lang/gawk \
 		nsgmls:textproc/jade \
 		sgmlsasp:textproc/sgmls
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	agmartin
 
 GNU_CONFIGURE=	yes
 USES=		gmake groff:both perl5 tar:bzip2
 CONFIGURE_ARGS=	--with-installed-sgmlsasp
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	bash:shells/bash
 DOCS_USES=		makeinfo tex
 DOCS_USE=		TEX=dvipsk:build,latex:build,pdftex:build
 DOCS_CONFIGURE_ENABLE=	docs
 
+post-stage:
+	@${RM} ${STAGEDIR}${DOCSDIR}/Makefile.orig \
+		${STAGEDIR}${DOCSDIR}/example/Makefile.orig
+
 .include <bsd.port.mk>
diff --git a/textproc/linuxdoc-tools/files/patch-perl5lib_LinuxDocTools.pm b/textproc/linuxdoc-tools/files/patch-perl5lib_LinuxDocTools.pm
new file mode 100644
index 000000000000..0c86c6c997ce
--- /dev/null
+++ b/textproc/linuxdoc-tools/files/patch-perl5lib_LinuxDocTools.pm
@@ -0,0 +1,24 @@
+--- perl5lib/LinuxDocTools.pm.orig	2023-06-12 16:57:27 UTC
++++ perl5lib/LinuxDocTools.pm
+@@ -621,8 +621,20 @@ sub process_file {
+     }
+   }
+ 
++  my %EXPAND_locale = (
++    'ascii' => 'C',
++    'latin' => 'C',
++    'latin1' => 'C',
++    'utf-8' => 'C.UTF-8',
++    'nippon' => 'ja_JP.eucJP',
++    'euc-kr' => 'ko_KR.eucKR'
++  );
++  die "$error_header: Unkown character set $global->{charset}.\n"
++    unless exists $EXPAND_locale{$global->{charset}};
++  my $EXPAND_envvars = "LC_ALL=$EXPAND_locale{$global->{charset}}";
++
+   my $sgmlsasp_command = "$main::progs->{SGMLSASP} $mapping < $preaspout |
+-      expand -t $global->{tabsize} > $aspout";
++      $EXPAND_envvars expand -t $global->{tabsize} > $aspout";
+   ldt_log "  ${error_header}::sgmlsasp_command:\n    $sgmlsasp_command";
+   system ($sgmlsasp_command) == 0
+     or die "$error_header: Error running $sgmlsasp_command. Aborting ...\n";