diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index b513f43261a2..4fffd82e3661 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -6,30 +6,31 @@
 #
 
 PORTNAME=	tkcvs
-PORTVERSION=	6.0
+PORTVERSION=	6.3
 CATEGORIES=	devel tk82
-MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
-		http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
+MASTER_SITES=	http://www.twobarleycorns.net/
 
 MAINTAINER=	shanee@augusta.de
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 NO_BUILD=	yes
-MAN1=		tkcvs.1 tkdiff.1
+MAN=		tkcvs.n
 
-post-extract:
-	${CP} ${WRKSRC}/tkcvs/tkcvs.n ${WRKSRC}/tkcvs/tkcvs.1
-	${CP} ${WRKSRC}/tkdiff/tkdiff.n ${WRKSRC}/tkdiff/tkdiff.1
+WISH=		wish8\.2
+TCLSH=		tclsh8\.2
+
+post-patch:
+	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkcvs/tkcvs.blank
+	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkdiff/tkdiff
 
 do-install:
-	(cd $(WRKSRC)/tkcvs; ${SETENV} ${MAKE_ENV} sh ./doinstall)
+	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl)
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined{NOPORTDOCS}
 	${MKDIR} ${PREFIX}/share/doc/tkcvs
-	${INSTALL_DATA} ${WRKSRC}/README.tkcvs $(PREFIX)/share/doc/tkcvs/
-	${INSTALL_DATA} ${WRKSRC}/tkdiff/README $(PREFIX)/share/doc/tkcvs/README.tkdiff
+	${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/distinfo b/devel/tkcvs/distinfo
index 9bef07b0d7ec..881784f03497 100644
--- a/devel/tkcvs/distinfo
+++ b/devel/tkcvs/distinfo
@@ -1 +1 @@
-MD5 (tkcvs-6.0.tar.gz) = e04f38cc344f9ea222fa48cb774ab7a5
+MD5 (tkcvs-6.3.tar.gz) = 59b141fcc658330939c9512033e15894
diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa
index da2a59dc3e5e..2df064e5f636 100644
--- a/devel/tkcvs/files/patch-aa
+++ b/devel/tkcvs/files/patch-aa
@@ -1,65 +1,63 @@
---- tkcvs/doinstall.orig	Tue Jan  9 22:17:52 1996
-+++ tkcvs/doinstall	Fri Oct 31 09:21:23 1997
-@@ -5,31 +5,31 @@
+--- doinstall.tcl.orig	Sun May  7 01:12:41 2000
++++ doinstall.tcl	Mon Sep  4 17:06:32 2000
+@@ -4,1 +4,1 @@
+-exec wish "$0" -- ${1+"$@"}
++exec wish8.2 "$0" -- ${1+"$@"}
+@@ -30,13 +30,9 @@
+      set msg(5) [file join $MANDIR tkcvs.n]
+   }
+   foreach m [lsort [array names msg]] {
+-    if {[winfo exists .messages.$m]} {
+-      destroy .messages.$m
+-    }
+     global var$m
+     set var$m $msg($m)
+-    label .messages.$m -text $msg($m) -justify left -textvariable var$m
+-    pack .messages.$m -side top -anchor w
++    puts var$m
+   }
+ }
  
- # Some rational and reasonable defaults.
+@@ -94,11 +90,6 @@
+   }
+   cd ..
+   puts "Finished!"
+-
+-  destroy .bottom.do
+-  destroy .bottom.not
+-  button .bottom.done -text "Finished!" -command {destroy .}
+-  pack .bottom.done
+ }
  
--INSTALLDIR=/usr/local/lib
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/mann
-+INSTALLDIR=${PREFIX}/share
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man1
+ #
+@@ -115,28 +106,6 @@
+   set TKDIFF "tkdiff"
+ }
  
- INSTALL_PROG=./install-sh
- 
- # This must be an X based editor -- do NOT use vi except via an xterm
- # or shelltool.
- 
--EDITOR=nedit
-+EDITOR="xedit"
- 
- # Find a Tk interpreter.
-  
--WISH=`which wish4.0`
-+WISH=`which wish8.2`
- if [ ! -f $WISH ]; then
--  WISH=`which wish4.1`
-+  WISH=`which wish4.0`
- fi
- if [ ! -f $WISH ]; then
--  echo "I cant find a Tk interpreter on your system"
-+  echo "I cant find a useful Tk interpreter on your system"
-   exit 1
- fi
- 
- # Find where the global bitmaps are.
- 
--for GDIR in /usr/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps /usr/local/include/bitmaps
-+for GDIR in /usr/X11R6/include/X11/bitmaps /usr/openwin/include/X11/bitmaps /usr/X11/include/bitmaps /usr/include/bitmaps ${PREFIX}/include/bitmaps
- do
-   if [ -d "$GDIR" ]; then
-     break
-@@ -62,10 +62,10 @@
- 
- # Some directories we have to create.
- 
--LDIR=${INSTALLDIR}/bitmaps
- TCDIR=${INSTALLDIR}/tkcvs
--mkdir -p $LDIR $TCDIR
--for dir in $LDIR $TCDIR
-+LDIR=${TCDIR}/bitmaps
-+mkdir -p $LDIR $TCDIR 
-+for dir in $TCDIR $LDIR
- do
-   if [ ! -d $dir ]; then
-     echo "I cant create the directory $dir"
-@@ -99,7 +99,7 @@
-   fi
- done
- 
--for f in *.n ../tkdiff/*.n
-+for f in *.1 ../tkdiff/*.1
- do
-         $INSTALL_PROG -m 444 $f $MANDIR
- done
+-frame .title
+-label .title.lbl -text "TkCVS Installer" -font {Helvetica -14 bold}
+-pack .title -side top
+-pack .title.lbl -side top
+-frame .entry
+-label .entry.instlbl -text "Installation Root"
+-entry .entry.instent -textvariable INSTALLROOT
+-bind .entry.instent <Return> {show_paths $INSTALLROOT}
+-pack .entry -side top -pady 10
+-pack .entry.instlbl -side left
+-pack .entry.instent -side left
+-
+-frame .messages -relief groove -bd 2
+-pack .messages -side top -expand y -fill x
+-label .messages.adv -text "These files will be installed:"
+-pack .messages.adv -side top
+ show_paths $INSTALLROOT
+-
+-frame .bottom
+-button .bottom.do -text "Install" -command {doinstall $INSTALLROOT}
+-button .bottom.not -text "Cancel" -command {destroy .}
+-pack .bottom -side top
+-pack .bottom.do -side left
+-pack .bottom.not -side left
+-
++doinstall $INSTALLROOT
++exit 0
diff --git a/devel/tkcvs/pkg-descr b/devel/tkcvs/pkg-descr
index 003dc4ca5c6a..93bc914e1da3 100644
--- a/devel/tkcvs/pkg-descr
+++ b/devel/tkcvs/pkg-descr
@@ -1,3 +1,3 @@
 This is a port of tkcvs and tkdiff, the Tcl/Tk frontends to CVS and diff 
 
-This is tkcvs version 6.0 and tkdiff version 1.0.
+This is tkcvs version 6.3 and tkdiff version 1.0.
diff --git a/devel/tkcvs/pkg-plist b/devel/tkcvs/pkg-plist
index 46e3ecb65cde..5998a94ffd39 100644
--- a/devel/tkcvs/pkg-plist
+++ b/devel/tkcvs/pkg-plist
@@ -1,45 +1,66 @@
 bin/tkcvs
 bin/tkdiff
+lib/tkcvs/commit.tcl
+lib/tkcvs/cvs.tcl
+lib/tkcvs/dialog.tcl
+lib/tkcvs/errors.tcl
+lib/tkcvs/filebrowse.tcl
+lib/tkcvs/gen_log.tcl
+lib/tkcvs/help.tcl
+lib/tkcvs/import.tcl
+lib/tkcvs/logcanvas.tcl
+lib/tkcvs/merge.tcl
+lib/tkcvs/modbrowse.tcl
+lib/tkcvs/modtree.tcl
+lib/tkcvs/modules.tcl
+lib/tkcvs/reports.tcl
+lib/tkcvs/search.tcl
+lib/tkcvs/static.tcl
+lib/tkcvs/tclIndex
+lib/tkcvs/tkcvs_def.tcl
+lib/tkcvs/tooltips.tcl
+lib/tkcvs/workdir.tcl
+lib/tkcvs/bitmaps/add.gif
+lib/tkcvs/bitmaps/adir.gif
+lib/tkcvs/bitmaps/amod.gif
+lib/tkcvs/bitmaps/arrow.gif
+lib/tkcvs/bitmaps/ball.gif
+lib/tkcvs/bitmaps/branch.gif
+lib/tkcvs/bitmaps/branchtag.gif
+lib/tkcvs/bitmaps/checkin.gif
+lib/tkcvs/bitmaps/checkout.gif
+lib/tkcvs/bitmaps/clean.gif
+lib/tkcvs/bitmaps/clear.gif
+lib/tkcvs/bitmaps/conflict.gif
+lib/tkcvs/bitmaps/delete.gif
+lib/tkcvs/bitmaps/diff.gif
+lib/tkcvs/bitmaps/dir.gif
+lib/tkcvs/bitmaps/export.gif
+lib/tkcvs/bitmaps/fileedit.gif
+lib/tkcvs/bitmaps/files.gif
+lib/tkcvs/bitmaps/fileview.gif
+lib/tkcvs/bitmaps/import.gif
+lib/tkcvs/bitmaps/logfile.gif
+lib/tkcvs/bitmaps/mdir.gif
+lib/tkcvs/bitmaps/mergebranch.gif
+lib/tkcvs/bitmaps/mergediff.gif
+lib/tkcvs/bitmaps/mod.gif
+lib/tkcvs/bitmaps/modbrowse.xbm
+lib/tkcvs/bitmaps/modules.gif
+lib/tkcvs/bitmaps/patches.gif
+lib/tkcvs/bitmaps/patchfile.gif
+lib/tkcvs/bitmaps/refresh.gif
+lib/tkcvs/bitmaps/remove.gif
+lib/tkcvs/bitmaps/tag.gif
+lib/tkcvs/bitmaps/tags.gif
+lib/tkcvs/bitmaps/tclfish.gif
+lib/tkcvs/bitmaps/tclfish.xbm
+lib/tkcvs/bitmaps/tclfish_fly.xbm
+lib/tkcvs/bitmaps/tkcvs32.xbm
+lib/tkcvs/bitmaps/tkcvs32_mask.xbm
+lib/tkcvs/bitmaps/tkcvs48.xbm
+lib/tkcvs/bitmaps/who.gif
 share/doc/tkcvs/README.tkcvs
-share/doc/tkcvs/README.tkdiff
-share/tkcvs/bindings.tcl
-share/tkcvs/checkout.tcl
-share/tkcvs/commit.tcl
-share/tkcvs/cvs.tcl
-share/tkcvs/errors.tcl
-share/tkcvs/filebrowse.tcl
-share/tkcvs/help.tcl
-share/tkcvs/import.tcl
-share/tkcvs/logcanvas.tcl
-share/tkcvs/merge.tcl
-share/tkcvs/modules.tcl
-share/tkcvs/reports.tcl
-share/tkcvs/search.tcl
-share/tkcvs/static.tcl
-share/tkcvs/tag.tcl
-share/tkcvs/tclIndex
-share/tkcvs/tkcvs_def.tcl
-share/tkcvs/tooltips.tcl
-share/tkcvs/update.tcl
-share/tkcvs/venget.tcl
-share/tkcvs/workdir.tcl
-share/tkcvs/bitmaps/add.xbm
-share/tkcvs/bitmaps/check.xbm
-share/tkcvs/bitmaps/checkin.xbm
-share/tkcvs/bitmaps/clean.xbm
-share/tkcvs/bitmaps/clear.xbm
-share/tkcvs/bitmaps/delete.xbm
-share/tkcvs/bitmaps/diff.xbm
-share/tkcvs/bitmaps/import.xbm
-share/tkcvs/bitmaps/logfile.xbm
-share/tkcvs/bitmaps/notebook.xbm
-share/tkcvs/bitmaps/refresh.xbm
-share/tkcvs/bitmaps/remove.xbm
-share/tkcvs/bitmaps/tkcvs16.xbm
-share/tkcvs/bitmaps/tkcvs32.xbm
-share/tkcvs/bitmaps/tkcvs32_mask.xbm
-share/tkcvs/bitmaps/tree16.xbm
-share/tkcvs/bitmaps/update.xbm
-@dirrm share/tkcvs/bitmaps
-@dirrm share/tkcvs
+@dirrm lib/tkcvs/bitmaps
+@dirrm lib/tkcvs
 @dirrm share/doc/tkcvs