diff --git a/srcpkgs/sqmail/files/qmail-smtpd/run b/srcpkgs/sqmail/files/qmail-smtpd/run
index 1c230ac0852..b837223661f 100755
--- a/srcpkgs/sqmail/files/qmail-smtpd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpd/run
@@ -3,6 +3,7 @@ QMAILU=$(id -u _qmaild)
 QMAILG=$(id -g _qmaild)
 HOSTNAME=$(hostname)
 export SPF="1"
+export UTF8="1"
 if [ -f /var/qmail/ssl/ssl.env ]; then
 	export UCSPITLS=""
 	. /var/qmail/ssl/ssl.env
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/run b/srcpkgs/sqmail/files/qmail-smtpsd/run
index d4169d97c46..41c3a80aa13 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsd/run
@@ -3,6 +3,7 @@ QMAILU=$(id -u _qmaild)
 QMAILG=$(id -g _qmaild)
 HOSTNAME=$(hostname)
 export SMTPAUTH="!"
+export UTF8="1"
 . /var/qmail/ssl/ssl.env
 exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
      sslserver -seV -Rp -l $HOSTNAME \
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/run b/srcpkgs/sqmail/files/qmail-smtpsub/run
index 26120d3b5a7..b858df70552 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsub/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsub/run
@@ -4,6 +4,7 @@ QMAILG=$(id -g _qmaild)
 HOSTNAME=$(hostname)
 export SMTPAUTH="!"
 export UCSPITLS="!"
+export UTF8="1"
 . /var/qmail/ssl/ssl.env
 exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
      sslserver -seVn -Rp -l $HOSTNAME \
diff --git a/srcpkgs/sqmail/patches/autouid.patch b/srcpkgs/sqmail/patches/autouid.patch
index 03025c5ca5e..535e5d02e79 100644
--- a/srcpkgs/sqmail/patches/autouid.patch
+++ b/srcpkgs/sqmail/patches/autouid.patch
@@ -1,7 +1,7 @@
 We generate the file auto_uids.c ourselves.
 
---- mail/sqmail/sqmail-4.0.03/src/Makefile.orig
-+++ mail/sqmail/sqmail-4.0.03/src/Makefile
+--- mail/sqmail/sqmail-4.0.04/src/Makefile.orig
++++ mail/sqmail/sqmail-4.0.04/src/Makefile
 @@ -95,20 +95,6 @@
  compile auto_split.c
  	./compile auto_split.c
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 89df2e7039a..056eebf2716 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
-version=4.0.03
-revision=2
+version=4.0.04
+revision=1
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://www.fehcom.de/sqmail/sqmail.html"
 distfiles="https://www.fehcom.de/sqmail/sqmail-${version}.tgz"
-checksum=fec96b51aee3506b6c068b0040304eb530f6926f719d9b917f07fac53f5e12bc
+checksum=e6da5e9951165b8e32984f03f7ecd6554176aad58f59c3431f4f6a97d868c9be
 nocross="custom build system"
 provides="smtp-server-0_1"
 replaces="smtp-server>=0"
@@ -61,7 +61,7 @@ _sqmtls_homedir="/var/qmail/ssl"
 
 do_configure() {
 	pwd >home
-	echo "${CC} ${CFLAGS} -DSMTPUTF8 -DIDN2" >../conf-cc
+	echo "${CC} ${CFLAGS} -DIDN2 -I${XBPS_CROSS_BASE}/usr/include/fehQlibs" >../conf-cc
 	echo "${CC} ${LDFLAGS}" >../conf-ld
 	echo "/var/qmail" >../conf-home