diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 83e9fb414811..0fa1e8aa7eb0 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -1,39 +1,44 @@
 # New ports collection makefile for:	SpecTcl1.1
 # Date created:		Fri Oct  3 18:50:53 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	SpecTcl
 PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	devel tk80
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/guitools/
+PORTREVISION=	2
+CATEGORIES=	devel tk83
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
+RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
-USE_REINPLACE=	yes
 NO_BUILD=	yes
+USE_REINPLACE=	yes
+
+WISH=		${LOCALBASE}/bin/wish8.3
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specJava
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specTcl
+.for file in specJava specTcl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		 s|%%WISH%%|${WISH}|g' ${WRKSRC}/bin/${file}
+.endfor
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/specJava ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/specTcl ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/SpecTcl
 	${INSTALL_DATA} ${WRKSRC}/changes ${PREFIX}/SpecTcl
 	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/SpecTcl
 	${MKDIR} ${PREFIX}/SpecTcl/lib
 	${CP} -r ${WRKSRC}/SpecTcl/* ${PREFIX}/SpecTcl/lib
 	${MKDIR} ${PREFIX}/SpecTcl/demo
 	${CP} -r ${WRKSRC}/demo/* ${PREFIX}/SpecTcl/demo
 	${MKDIR} ${PREFIX}/SpecTcl/examples
 	${CP} -r ${WRKSRC}/examples/* ${PREFIX}/SpecTcl/examples
 
 .include <bsd.port.mk>
diff --git a/devel/SpecTcl/files/patch-aa b/devel/SpecTcl/files/patch-aa
index fef668eaa196..a7774a7d8ba4 100644
--- a/devel/SpecTcl/files/patch-aa
+++ b/devel/SpecTcl/files/patch-aa
@@ -1,15 +1,15 @@
 --- bin/specTcl.orig	Fri Oct  3 23:04:56 1997
 +++ bin/specTcl	Fri Oct  3 23:51:41 1997
 @@ -8,10 +8,10 @@
  # SCCS: @(#) specTcl 1.9 97/06/26 10:06:06
  
  # Change DIR to the directory that contains the SpecTcl source files
 -DIR=../SpecTcl
 +DIR=%%PREFIX%%/SpecTcl/lib
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.0
++WISH=%%WISH%%
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk $@ &
  echo "Starting SpecTcl 1.1"
diff --git a/devel/SpecTcl/files/patch-ab b/devel/SpecTcl/files/patch-ab
index f9936ddf949d..a77bd9d9cd5a 100644
--- a/devel/SpecTcl/files/patch-ab
+++ b/devel/SpecTcl/files/patch-ab
@@ -1,15 +1,15 @@
 --- bin/specJava.orig	Fri Oct  3 23:04:48 1997
 +++ bin/specJava	Fri Oct  3 23:51:33 1997
 @@ -8,10 +8,10 @@
  # SCCS: @(#) specJava 1.7 97/06/26 10:06:45
  
  # Change DIR to the directory that contains the SpecTcl source files
 -DIR=../SpecTcl
 +DIR=%%PREFIX%%/SpecTcl/lib
  
  # Change WISH to the pathname of your tk4.1a2 (or >) wish binary
 -WISH=`which wish`
-+WISH=wish8.0
++WISH=%%WISH%%
  
  env SPECTCL_DIR=$DIR $WISH $DIR/main.tk -java $@ &
  echo "Starting SpecTcl 1.0"
diff --git a/devel/SpecTcl/pkg-descr b/devel/SpecTcl/pkg-descr
index 9b373d4cc594..624c44cb4ca6 100644
--- a/devel/SpecTcl/pkg-descr
+++ b/devel/SpecTcl/pkg-descr
@@ -1,19 +1,19 @@
 Main Features of Sun's SpecTcl 1.1
 ==================================
 
 Easy to Learn:		SpecTcl's drag & drop interface along with a
 			powerful toolbar and on-line help make it easy
 			to start building GUI applications.
 
 Tcl and Java Support:	SpecTcl generates both Tcl and Java code.
 
 Platform Independent:	SpecTcl runs on all major platforms:
 			Solaris, SunOS, Linux, Windows 95,
 			Windows NT Server 3.51, Windows NT Workstation 3.51,
 			MacOS, and Irix. 
 
 Constraint Based	Alignment and resizing of widgets (buttons,
 Geometry Manager:	check boxes, etc.) is automatic. This makes
 			creating dynamic UIs and cross platform UIs a snap! 
 
-WWW: http://sunscript.sun.com/products/spectcl.html
+WWW: http://spectcl.sourceforge.net/