diff --git a/lang/tcl/8.4/Makefile b/lang/tcl/8.4/Makefile
index 5fbaedf30ec..ef12fbd333e 100644
--- a/lang/tcl/8.4/Makefile
+++ b/lang/tcl/8.4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2005/11/03 18:28:55 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2006/01/08 13:08:01 alek Exp $
 # Uses pthreads (can but does not at the moment)
 
 COMMENT=	"Tool Command Language"
@@ -7,6 +7,7 @@ VERSION=	8.4.7
 
 DISTNAME=	tcl${VERSION}-src
 PKGNAME=	tcl-${VERSION}p1
+SHARED_LIBS=	tcl84 1.0
 CATEGORIES=	lang lang/tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 WANTLIB=	c m
@@ -30,7 +31,8 @@ FAKE_FLAGS=	INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
 SEPARATE_BUILD=	concurrent
 AUTOCONF_VERSION=2.13
 CONFIGURE_STYLE= autoconf no-autoheader
-CONFIGURE_ENV=	PORTSDIR="${PORTSDIR}"
+CONFIGURE_ENV=	PORTSDIR="${PORTSDIR}" \
+		LIBtcl84_VERSION=${LIBtcl84_VERSION}
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include/tcl8.4"
 
 WRKDIST=	${WRKDIR}/tcl${VERSION}/unix
diff --git a/lang/tcl/8.4/patches/patch-tcl_m4 b/lang/tcl/8.4/patches/patch-tcl_m4
index 7b5c6bfebec..70b07342758 100644
--- a/lang/tcl/8.4/patches/patch-tcl_m4
+++ b/lang/tcl/8.4/patches/patch-tcl_m4
@@ -41,7 +41,7 @@
 +		DL_LIBS=""
 +		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 +		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBtcl84_VERSION}'
 +		AC_MSG_CHECKING(for ELF)
 +		AC_EGREP_CPP(yes, [
  #ifdef __ELF__
diff --git a/lang/tcl/8.4/pkg/PFRAG.shared b/lang/tcl/8.4/pkg/PFRAG.shared
index 9c657cbf725..3644b4e23ae 100644
--- a/lang/tcl/8.4/pkg/PFRAG.shared
+++ b/lang/tcl/8.4/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/07 06:13:57 kevlo Exp $
-@lib lib/libtcl84.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 13:08:01 alek Exp $
+@lib lib/libtcl84.so.${LIBtcl84_VERSION}