diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 9a6aa9ebea8c..f29b55562628 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	tcltls
-PORTVERSION=	1.4.1
-CATEGORIES=	devel tcl83
+PORTVERSION=	1.5.0
+CATEGORIES=	devel tcl83 tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tls
 DISTNAME=	tls${PORTVERSION}-src
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	tcl${TCLVND}:${PORTSDIR}/lang/tcl${TCLVND}
 
 USE_OPENSSL=	Yes
 
-WRKSRC=	${WRKDIR}/tls1.4
+WRKSRC=	${WRKDIR}/tls${PORTVERSION:R}
 
 pre-patch:
 	# Fixing the end-of-lines:
@@ -33,12 +33,28 @@ MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		OPENSSLINC="${OPENSSLINC}" OPENSSLLIB="${OPENSSLLIB}" \
 		OPENSSLDIR="${OPENSSLDIR}" CFLAGS="${CFLAGS}" \
+		SHLIB_NAME=libtls.so.1 \
 		PORTVERSION="${PORTVERSION}" SED="${SED}"
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
+ALL_TARGET=	all
+
+post-patch:
+	${REINPLACE_CMD} -e \
+		's,package require tls.*,load ${WRKSRC}/libtls.so;\
+			source ${WRKSRC}/tls.tcl,' \
+		${WRKSRC}/tests/*.test
+	# The ciphers.test were meaningless so far:
+	${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken
 
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/tls
 	${INSTALL_DATA} ${WRKSRC}/tls.htm ${PREFIX}/share/doc/tls/
 
+post-build test:
+	cd ${WRKSRC}/tests && env TCL_LIBRARY="${WRKSRC}" \
+		tclsh${TCL_VER} all.tcl
+
 TCL_VER?=	8.4
 TCLVND=		${TCL_VER:S/.//}
 
diff --git a/devel/tcltls/distinfo b/devel/tcltls/distinfo
index 08075d759dcd..129405bc2d86 100644
--- a/devel/tcltls/distinfo
+++ b/devel/tcltls/distinfo
@@ -1,2 +1,2 @@
-MD5 (tls1.4.1-src.tar.gz) = 358bc16e8fd5a335dbf2e855426885d2
-SIZE (tls1.4.1-src.tar.gz) = 94074
+MD5 (tls1.5.0-src.tar.gz) = 9eeab472475773b3810acc808ebec759
+SIZE (tls1.5.0-src.tar.gz) = 113600
diff --git a/devel/tcltls/files/Makefile.bsd b/devel/tcltls/files/Makefile.bsd
index 1462170044f3..f1fe1fad661b 100644
--- a/devel/tcltls/files/Makefile.bsd
+++ b/devel/tcltls/files/Makefile.bsd
@@ -1,6 +1,10 @@
 PACKAGE		= tls
-VERSION		?= ${PORTVERSION}
-SHLIB_NAME	= lib${PACKAGE}.so.${VERSION:R}
+VERSION		?= ${PORTVERSION:R}
+.ifndef(SHLIB_NAME)
+LIB		= ${PACKAGE}
+SHLIB_MAJOR	= ${VERSION:R}
+SHLIB_MINOR	= ${VERSION:E}
+.endif
 
 SRCS		= tls.c tlsIO.c tlsBIO.c tlsX509.c # fixstrtod.c strncasecmp.c
 
diff --git a/devel/tcltls/files/patch-name b/devel/tcltls/files/patch-name
deleted file mode 100644
index 4270216f1ecb..000000000000
--- a/devel/tcltls/files/patch-name
+++ /dev/null
@@ -1,9 +0,0 @@
---- tlsIO.c	Fri Aug 18 15:17:36 2000
-+++ tlsIO.c	Tue May 15 15:44:45 2001
-@@ -148,5 +148,6 @@
- 	 * Common elements of the structure (no changes in location or name)
- 	 * close2Proc, seekProc, setOptionProc stay NULL.
- 	 */
- 
-+	tlsChannelType->typeName         = "tls";
- 	tlsChannelType->closeProc        = TlsCloseProc;