diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 81627be5d10c..fe8429dabc39 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -1,48 +1,48 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 
 PORTNAME=	tclhttpd
 PORTVERSION=	3.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www tcl
 MASTER_SITES=	TCLTK/httpd
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Http-server implemented in TCL
 
 RUN_DEPENDS=	dtplite:devel/tcllib
 
 USE_RC_SUBR=	tclhttpd
 
 USES=		tcl:tea
 
 .include <bsd.port.pre.mk>
 
 SHLIB_NAME!=	${MAKE} -f "${FILESDIR}/Makefile.lib" -V SHLIB_NAME
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		SHLIB_NAME=${SHLIB_NAME}
 MAKE_ENV+=	TCLSH_PROG=${TCLSH} FILESDIR="${FILESDIR}" TCL_DVER=${TCL_VER} \
 		PREFIX=${STAGEDIR}${PREFIX}
 SCRIPTS_ENV+=	TCL_DVER=${TCL_VER}
 SUB_LIST+=	TCL_DVER=${TCL_VER}
 
 do-build:
 	${MAKE_ENV} ${MAKE} -C ${WRKSRC} ${MAKE_ARGS}	\
 		FILESDIR="${FILESDIR}"	\
 		${_MAKE_JOBS} -f "${FILESDIR}/Makefile.lib"
 
 pre-su-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/tclhttpd/custom
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/${SHLIB_NAME} \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}/${SHLIB_NAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/httpd.tcl \
 		${WRKSRC}/bin/httpdthread.tcl ${STAGEDIR}${PREFIX}/bin/
 	${SED} 's%@VER@%${PORTVERSION}%g' < ${WRKSRC}/bin/tclhttpd.rc \
 		> ${STAGEDIR}${PREFIX}/etc/tclhttpd.rc.default
 	${SED} 's%@LIB@%${SHLIB_NAME}%g' < \
 		${FILESDIR}/pkgIndex.tcl >> \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl
 
 .include <bsd.port.post.mk>
diff --git a/www/tclhttpd/files/patch-lib__config.tcl b/www/tclhttpd/files/patch-lib__config.tcl
new file mode 100644
index 000000000000..ad4f7dfcc09c
--- /dev/null
+++ b/www/tclhttpd/files/patch-lib__config.tcl
@@ -0,0 +1,10 @@
+--- lib/config.tcl	2000-08-02 03:06:52.000000000 -0400
++++ lib/config.tcl	2016-06-05 14:51:18.000000000 -0400
+@@ -52,6 +52,9 @@
+ 
+     set i [interp create -safe]
+     interp expose $i file
++    foreach subcommand {isdirectory exists dirname} {
++      interp alias $i ::tcl::file::$subcommand {} file $subcommand
++    }
+