diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 2f343e437508..79883db6de70 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,45 +1,61 @@
 PORTNAME=	slrn
-PORTVERSION=	1.0.3a
-PORTREVISION=	2
+DISTVERSIONPREFIX=	pre
+DISTVERSION=	1.0.4-9
 CATEGORIES=	news
-MASTER_SITES=	http://www.jedsoft.org/releases/slrn/
+MASTER_SITES=	http://www.jedsoft.org/snapshots/ \
+		https://micha.freeshell.org/libcanlock/patches/:canlock
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		slrn-${DISTVERSION}_libcanlock3_patches${EXTRACT_SUFX}:canlock
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SLang-based newsreader
-WWW=		https://slrn.sourceforge.net/
+WWW=		https://slrn.info/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libslang.so:devel/libslang2
 
-CONFLICTS_INSTALL=	ja-slrn
-
-USES=		gmake iconv tar:bz2
+USES=		gmake iconv
 
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS+=--disable-inews --with-slrnpull \
-		${ICONV_CONFIGURE_ARG}
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} \
+			--disable-inews \
+			--with-slrnpull
 
+MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	all
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[a-z]$//}
 
-MAKE_JOBS_UNSAFE=	yes
+CONFLICTS_INSTALL=	ja-slrn
 
-OPTIONS_DEFINE=	NLS SSL DEVIEW DOCS
-OPTIONS_DEFAULT=SSL
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		CANLOCK DEVIEW DOCS NLS SSL
+OPTIONS_DEFAULT=	CANLOCK SSL
+OPTIONS_SUB=		yes
+
+CANLOCK_DESC=	Enable Cancel-Lock support via libcanlock
+DEVIEW_DESC?=	UUdecode view support
+
+CANLOCK_LIB_DEPENDS=	libcanlock.so:news/libcanlock
+CANLOCK_CONFIGURE_ON=	--with-canlock=${LOCALBASE}
+CANLOCK_CONFIGURE_OFF=	--without-canlock
+CANLOCK_EXTRA_PATCHES=	${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-changes.txt \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-doc_manual.txt \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-doc_slrn.rc \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-src_art.c \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-src_misc.c \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-src_misc.h \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-src_post.c \
+			${WRKDIR}/slrn-${DISTVERSION}_libcanlock3_patches/patch-src_startup.c
+DEVIEW_LIB_DEPENDS=	libuu.so:converters/uulib
+DEVIEW_CONFIGURE_WITH=	uulib
+DOCS_CONFIGURE_OFF=	--with-docdir=${WRKSRC}/dummy
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	ssl
-DEVIEW_DESC?=		UUdecode view support
-DEVIEW_LIB_DEPENDS=	libuu.so:converters/uulib
-DEVIEW_CONFIGURE_WITH=	uulib
-DOCS_CONFIGURE_OFF=	--with-docdir=${WRKSRC}/dummy
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
 		${WRKSRC}/src/slrnfeat.hin
 
 .include <bsd.port.mk>
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index 6e614947f728..64955fa0ee37 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1478436588
-SHA256 (slrn-1.0.3a.tar.bz2) = 3ba8a4d549201640f2b82d53fb1bec1250f908052a7983f0061c983c634c2dac
-SIZE (slrn-1.0.3a.tar.bz2) = 997138
+TIMESTAMP = 1779007500
+SHA256 (slrn-pre1.0.4-9.tar.gz) = 827d01c529c658492e45a376b99495a932d0d6be1e8e207df6f0062a25f1cff8
+SIZE (slrn-pre1.0.4-9.tar.gz) = 1563860
+SHA256 (slrn-1.0.4-9_libcanlock3_patches.tar.gz) = 45e50eab5618df6fa3df8a14f9dc657dd582a1e660da465a41302882791eabb2
+SIZE (slrn-1.0.4-9_libcanlock3_patches.tar.gz) = 2804