diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 8ab85e2917f2..f0cda0eded57 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -6,11 +6,11 @@
 
 PORTNAME=	expect
 PORTVERSION=	5.43.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang tcl tk
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	A sophisticated scripter based on tcl/tk
 
 CONFLICTS=	expect-5.44* weather-[0-9]*
@@ -64,6 +64,9 @@ MAN3=		libexpect.3
 .endif
 
 post-patch:
+	${REINPLACE_CMD} -e \
+		's|@TCLHDIRDASHI@|& -I${LOCALBASE}/include/tcl8.4/unix|' \
+		${WRKSRC}/Makefile.in ${WRKSRC}/DbgMkfl.in
 	${TOUCH} ${WRKSRC}/configure
 
 post-install:
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 46ef75855235..d55b568b136a 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.5.1
 CATEGORIES=	misc tcl tk
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Automated program/system tester
 
 LICENSE=	GPLv3