diff --git a/lang/eltclsh/Makefile b/lang/eltclsh/Makefile
index 6189c525f1f..a8a292a81f1 100644
--- a/lang/eltclsh/Makefile
+++ b/lang/eltclsh/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/08/30 14:02:18 matthieu Exp $
+# $OpenBSD: Makefile,v 1.13 2008/09/28 08:00:33 sturm Exp $
 
 COMMENT =	Libedit interface to Tcl/Tk interpreters
 
 DISTNAME =	eltclsh-1.9
+PKGNAME=	${DISTNAME}p0
 CATEGORIES =	lang x11
 
 MASTER_SITES =	http://softs.laas.fr/openrobots/php/download.php/
@@ -16,10 +17,12 @@ PERMIT_PACKAGE_CDROM =	 Yes
 PERMIT_PACKAGE_FTP =	 Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	 Yes
-WANTLIB =		c termcap X11 Xau Xdmcp m edit 
+WANTLIB =		c termcap X11 Xau Xdmcp Xext Xss m edit 
 
 SEPARATE_BUILD =	concurrent
 CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS =	--with-tcl=${LOCALBASE}/lib/tcl8.5 \
+			--with-tk=${LOCALBASE}/lib/tk8.5
 CONFIGURE_ENV =		MKDEP=/bin/false
 USE_X11 =		Yes
 USE_GMAKE =		Yes
@@ -29,6 +32,6 @@ FAKE_FLAGS =		"ELTCL_LIBRARY=${WRKINST}${PREFIX}/share/eltcl"
 NO_REGRESS =		Yes
 
 LIB_DEPENDS +=		tcl85:tcl-8.5.*:lang/tcl/8.5
-LIB_DEPENDS +=		tk84:tk-8.5.*:x11/tk/8.5
+LIB_DEPENDS +=		tk85:tk-8.5.*:x11/tk/8.5
 
 .include <bsd.port.mk>