diff --git a/www/websh/Makefile b/www/websh/Makefile
index f4c83d23a329..7e71259fe02d 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -1,89 +1,89 @@
 PORTNAME=	websh
 PORTVERSION=	3.6.0b5
-PORTREVISION=	6
+PORTREVISION=	7
 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
 WWW=		https://tcl.apache.org/websh/
 
 MAKE_JOBS_UNSAFE=	yes
 
 LIBSUF=		${PORTVERSION:S/.//g}
 
 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+=	LIBSUF=${LIBSUF} WS_VER=${PORTVERSION}
 SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
 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]
+		${WRKSRC:H}/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${LIBSUF}.so.1.0 ]; then	\
 		${INSTALL_LIB} ${WRKSRC}/libwebsh${LIBSUF}.so.1.0 \
 			${STAGEDIR}${PREFIX}/lib;	\
 		${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${LIBSUF}.so.1 \
 			${STAGEDIR}${PREFIX}/lib;	\
 		${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/files/pkgIndex.tcl.in b/www/websh/files/pkgIndex.tcl.in
index 2c6a688fad6e..39aa4c08819b 100644
--- a/www/websh/files/pkgIndex.tcl.in
+++ b/www/websh/files/pkgIndex.tcl.in
@@ -1,3 +1,3 @@
 if {[package vcompare [info tclversion] 8.3] < 0} return
 
-package ifneeded websh %%WS_VER%% [list load [file join [file dirname $dir] libwebsh%%TCL_DVER%%.so.1]]
+package ifneeded websh %%WS_VER%% [list load [file join [file dirname $dir] libwebsh%%LIBSUF%%.so.1]]