diff --git a/www/websh/Makefile b/www/websh/Makefile
index 1bd573d42a91..769774928eb7 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -1,94 +1,90 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 
 PORTNAME=	websh
 PORTVERSION=	3.6.0b5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www tcl
 MASTER_SITES=	https://archive.apache.org/dist/tcl/${PORTNAME}/source/
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Embeds a TCL8 interpreter in the Apache server
 
-BROKEN=		does not install: work/websh-3.6.0b5/src/unix/libwebsh86.so.1: No such file or directory
-DEPRECATED=	Abandoned upstream, last release in 2009
-EXPIRATION_DATE=2022-03-31
-
 MAKE_JOBS_UNSAFE=	yes
 
-TCL_DVER=	${TCL_VER:S/.//}
+LIBSUF=		${PORTVERSION:S/.//g}
 
-USES=		apache:2.2+ autoreconf gmake tcl:tea
+USES=		apache autoreconf gmake tcl:tea
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
 USE_LDCONFIG=	yes
 SUB_FILES=	httpd.conf pkgIndex.tcl pkg-message
-SUB_LIST+=	TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION}
+SUB_LIST+=	LIBSUF=${LIBSUF} WS_VER=${PORTVERSION}
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
-PLIST_SUB+=	TCL_DVER=${TCL_DVER}
+PLIST_SUB+=	LIBSUF=${LIBSUF}
 PLIST_SUB+=	NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir`
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 CPPFLAGS+=	-I ${LOCALBASE}/include/apr-1
 .if !defined(NO_WERROR) && ${CC} == "cc" || ${CC:T:Mgcc*} != ""
 CPPFLAGS+=	-Wall -Werror
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local/websh,${PREFIX},' \
 		${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf
 	for p in ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.html ; do	\
 		${SED} -e 's,\.html,.whtml,g' < $$p >	\
 			`${DIRNAME} $$p`/`${BASENAME} $$p .html`.whtml;	\
 	done
 	${REINPLACE_CMD} -e 's,\.html,.whtml,g' ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3
 	${REINPLACE_CMD} -e 's|__declspec(dllexport)|DLLEXPORT|' \
 		${WRKSRC}/../generic/*.[ch]
 
 post-configure:
 	# Remove the "STUBS" and the PACKAGE_* defines, which may conflict
 	# with Apache's definitions:
 	${REINPLACE_CMD} -e 's,tclstub,tcl,'	\
 		-e 's,-DPACKAGE_[^=]*=."[^"]*",,g' ${WRKSRC}/Makefile
 
 post-build test:
 	${SETENV} HOME=${WRKDIR} ${MAKE_CMD} -C ${WRKSRC} test | ${AWK} '\
 		/Failed/ && $$NF {failed=1}	\
 		END {exit failed}	\
 		{print}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/*.ws3	\
 		${WRKDIR}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
 	${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf	\
 		${STAGEDIR}${PREFIX}/etc/websh.conf.dist
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so
-	if [ -f ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 ]; then	\
-		${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \
+	if [ -f ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 ]; then	\
+		${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 \
 			${STAGEDIR}${PREFIX}/lib;	\
-		${LN} -sf libwebsh${TCL_DVER}.so.1.0	\
-			${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1;	\
-		${LN} -sf libwebsh${TCL_DVER}.so.1.0	\
-			${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so;	\
+		${LN} -sf libwebsh${LIBSUF}.so.1.0	\
+			${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so.1;	\
+		${LN} -sf libwebsh${LIBSUF}.so.1.0	\
+			${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so;	\
 	else	\
-		${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \
+		${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1 \
 			${STAGEDIR}${PREFIX}/lib;	\
-		${LN} -sf libwebsh${TCL_DVER}.so.1	\
-			${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so;	\
+		${LN} -sf libwebsh${LIBSUF}.so.1	\
+			${STAGEDIR}${PREFIX}/lib/libwebsh${LIBSUF}.so;	\
 	fi
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3	\
 		${WRKSRC:H:H}/doc/mod_websh/htdocs/*.whtml		\
 		${WRKDIR}/httpd.conf ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC:H:H}/doc/html/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/websh/pkg-plist b/www/websh/pkg-plist
index 55916c920473..7c959b91abaa 100644
--- a/www/websh/pkg-plist
+++ b/www/websh/pkg-plist
@@ -1,10 +1,10 @@
-%%NOMINORVERSION%%lib/libwebsh%%TCL_DVER%%.so.1.0
-lib/libwebsh%%TCL_DVER%%.so.1
-lib/libwebsh%%TCL_DVER%%.so
+%%NOMINORVERSION%%lib/libwebsh%%LIBSUF%%.so.1.0
+lib/libwebsh%%LIBSUF%%.so.1
+lib/libwebsh%%LIBSUF%%.so
 lib/websh/pkgIndex.tcl
 lib/websh/htmlhandler.ws3
 lib/websh/otherhandler.ws3
 etc/websh.conf.dist
 %%APACHEMODDIR%%/mod_websh.so
 @exec %D/sbin/apxs -e -A -n websh %D/%F
 @unexec %D/sbin/apxs -e -A -n websh %D/%F