diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index fe32a75fc95..b77f5f18b2c 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 1999/10/27 20:16:52 brad Exp $
+# $OpenBSD: Makefile,v 1.16 2000/01/01 07:10:58 brad Exp $
 
 DISTNAME=	expect-5.30
 CATEGORIES=	lang
@@ -8,8 +8,7 @@ NEED_VERSION=	1.73
 
 MAINTAINER=	niklas@openbsd.org
 
-LIB_DEPENDS=	tcl80.1.5:${PORTSDIR}/lang/tcl80 \
-		tk80.1.5:${PORTSDIR}/x11/tk80
+LIB_DEPENDS=	tk80.1.5:${PORTSDIR}/x11/tk80
 
 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
@@ -21,8 +20,8 @@ CONFIGURE_ARGS+=--with-tclconfig=${PREFIX}/lib/tcl8.0 \
 
 WRKSRC=	${WRKDIR}/${PKGNAME}
 
-test:
-	@(cd ${WRKBUILD}; ${MAKE} test)
+test:	build
+	@(cd ${WRKBUILD}; make test)
 
 post-install:
 	@${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/expect/pkg/PLIST b/lang/expect/pkg/PLIST
index ccb223f81a4..cf5e6ee2146 100644
--- a/lang/expect/pkg/PLIST
+++ b/lang/expect/pkg/PLIST
@@ -20,13 +20,13 @@ bin/unbuffer
 bin/weather
 bin/xkibitz
 bin/xpstat
-include/tcldbg.h
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tclRegexp.h
-lib/expect5.30/pkgIndex.tcl
+include/tcldbg.h
 lib/expect5.30/libexpect530.a
+lib/expect5.30/pkgIndex.tcl
 lib/libexpect530.a
 lib/libexpect530.so.1.2
 @exec /sbin/ldconfig -m %B
diff --git a/lang/expect/pkg/PLIST.noshared b/lang/expect/pkg/PLIST.noshared
index 41954ba15df..90a91e0348f 100644
--- a/lang/expect/pkg/PLIST.noshared
+++ b/lang/expect/pkg/PLIST.noshared
@@ -20,11 +20,11 @@ bin/unbuffer
 bin/weather
 bin/xkibitz
 bin/xpstat
-include/tcldbg.h
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tclRegexp.h
+include/tcldbg.h
 lib/expect5.30/libexpect530.a
 lib/libexpect530.a
 man/man1/autoexpect.1