diff --git a/security/maia/Makefile b/security/maia/Makefile
index 996471ae9fe5..611c4fed77e6 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	maia
 DISTVERSION=	1.0.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	security
 
 MAINTAINER=	ek@purplehat.org
@@ -317,7 +317,9 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
 	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+.if ${PORT_OPTIONS:MWEBHOST}
 	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
+.endif
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
 	${MKDIR} ${STAGEDIR}${ETCDIR}/templates
diff --git a/security/maia/files/patch-maiad b/security/maia/files/patch-maiad
new file mode 100644
index 000000000000..7c31a2b346e1
--- /dev/null
+++ b/security/maia/files/patch-maiad
@@ -0,0 +1,12 @@
+--- maiad.orig	2022-12-01 19:36:50 UTC
++++ maiad
+@@ -3833,9 +3833,6 @@ sub maia_store_mail($$$$$@) {
+     $subject = substr($subject, 0, 255) if length($subject) > 255;
+     $subject = untaint($subject);
+     $sender = substr($sender, 0, 255) if length($sender) > 255;
+-    if ($document_charset ne "") {
+-	from_to($contents, $document_charset, 'UTF-8');
+-    }
+ 
+     if (!$oversized) {
+         if ($dbtype =~ /^mysql$/si) { # MySQL
diff --git a/security/maia/pkg-plist b/security/maia/pkg-plist
index f82341a228c9..a349917f4709 100644
--- a/security/maia/pkg-plist
+++ b/security/maia/pkg-plist
@@ -72,7 +72,7 @@ sbin/maiad
 %%WWWDIR%%/images/view-raw.png
 %%WWWDIR%%/images/white-black-list.png
 %%WWWDIR%%/index.php
-%%WWWDIR%%/libs/Smarty
+%%WEBHOST%%%%WWWDIR%%/libs/Smarty
 %%WWWDIR%%/libs/jquery/images/arrowdown.gif
 %%WWWDIR%%/libs/jquery/images/arrowleft.gif
 %%WWWDIR%%/libs/jquery/images/arrowright.gif