diff --git a/mail/spamassassin-dqs/Makefile b/mail/spamassassin-dqs/Makefile
index 5b342b253dbb..ccd10ca4c386 100644
--- a/mail/spamassassin-dqs/Makefile
+++ b/mail/spamassassin-dqs/Makefile
@@ -1,50 +1,48 @@
 PORTNAME=		spamassassin-dqs
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.2.2
+DISTVERSION=		1.4.0
 CATEGORIES=		mail
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	Real-Time DNSBL's that catch a bunch of additional spam
 WWW=		https://github.com/spamhaus/spamassassin-dqs/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	spamassassin:mail/spamassassin
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	spamhaus
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	etc/mail/spamassassin/SH.pm \
 		"@sample etc/mail/spamassassin/sh.cf.sample" \
 		etc/mail/spamassassin/sh_scores.cf \
 		etc/mail/spamassassin/sh.pre \
 		share/doc/spamassassin-dqs/README.md
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	HBL
 HBL_DESC=	enable HBL lookups (PAID OPTION)
 
 HBL_PLIST_FILES=	"@sample etc/mail/spamassassin/sh_hbl.cf.sample" \
 			etc/mail/spamassassin/hbltest.sh \
 			etc/mail/spamassassin/sh_hbl_scores.cf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<config_directory>|${PREFIX}/etc/mail/spamassassin|' ${WRKSRC}/sh.pre
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail/spamassassin
-	${INSTALL_DATA} ${WRKSRC}/sh.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh.cf.sample
-	${INSTALL_DATA} ${WRKSRC}/sh.pre ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
-	${INSTALL_DATA} ${WRKSRC}/SH.pm ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
-	${INSTALL_DATA} ${WRKSRC}/sh_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN}  ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 do-install-HBL-on:
-	${INSTALL_DATA} ${WRKSRC}/sh_hbl.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh_hbl.cf.sample
-	${INSTALL_DATA} ${WRKSRC}/sh_hbl_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_hbl.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh_hbl.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/4.0.0+/sh_hbl_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 
 .include <bsd.port.mk>
diff --git a/mail/spamassassin-dqs/distinfo b/mail/spamassassin-dqs/distinfo
index 8cb1ad9bef77..ac00075fd37a 100644
--- a/mail/spamassassin-dqs/distinfo
+++ b/mail/spamassassin-dqs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650575392
-SHA256 (spamhaus-spamassassin-dqs-v1.2.2_GH0.tar.gz) = 209b33877122965ae2323884270a3d2f24b6838fabbeb87db150f4a132f6f561
-SIZE (spamhaus-spamassassin-dqs-v1.2.2_GH0.tar.gz) = 22304
+TIMESTAMP = 1672764743
+SHA256 (spamhaus-spamassassin-dqs-v1.4.0_GH0.tar.gz) = 7a0e912d0eb4e24f3f07657e12d8fdd9785e1a36951deb19ddae3a020c2e0312
+SIZE (spamhaus-spamassassin-dqs-v1.4.0_GH0.tar.gz) = 25532
diff --git a/mail/spamassassin-dqs/files/pkg-message.in b/mail/spamassassin-dqs/files/pkg-message.in
index 215dc7226956..986d9ed90817 100644
--- a/mail/spamassassin-dqs/files/pkg-message.in
+++ b/mail/spamassassin-dqs/files/pkg-message.in
@@ -1,45 +1,45 @@
 [
 {
  message: <<EOM
 you will need to configure the sh.cf file with your own
 DQS key.   
 
 Follow the instructions at:
 https://www.spamhaustech.com/dqs/
 to get a key, then go to:
 https://portal.spamhaustech.com/manuals/dqs/
 and note the DQS key under section "1.0 Datafeed Query Service".
 
 Once you have it, run the following as root:
 
 cd %%PREFIX%%/etc/mail/spamassassin
 sed -e 's/your_DQS_key/<your key from above>/g' sh.cf.sample >sh.cf
 
 if the HBL option is selected, issue the following as well:
 sed -e 's/your_DQS_key/<your key from above>/g' sh_hbl.cf.sample >sh_hbl.cf
 
 (for more information on HBL, see %%DOCSDIR%%/README.md)
 
 then restart spamassassin.
 EOM
   type: install
 }
 {
  message: <<EOM
 You will need to re-run this as root:
 
 cd %%PREFIX%%/etc/mail/spamassassin
 sed -e 's/your_DQS_key/<your key from above>/g' sh.cf.sample >sh.cf
 
 if the HBL option is selected, issue the following as well:
 sed -e 's/your_DQS_key/<your key from above>/g' sh_hbl.cf.sample >sh_hbl.cf
 
 (for more information on HBL, see %%DOCSDIR%%/README.md)
 
 and restart spamassassin
 EOM
    type: upgrade
-   maximum_version: "1.2.2"
+   maximum_version: "1.4.0"
 }
 ]