diff --git a/devel/tide/Makefile b/devel/tide/Makefile
index 1363ea3014f7..3901e49fdcab 100644
--- a/devel/tide/Makefile
+++ b/devel/tide/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	tide
-PORTVERSION=	1.6
+PORTVERSION=	2.0.4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.not-compatible.org/files/ \
+MASTER_SITES=	http://t3x.dyndns.org/files/ \
 		http://www.t3x.org/files/
 DISTNAME=	tide-${PORTVERSION:S/.//g}
 
 MAINTAINER=	nmh@t3x.org
-COMMENT=	T3X Integrated Development Environment and T3X Tool classes
-
-BROKEN=		Does not build
+COMMENT=	T3X Integrated Development Environment and tools
 
 BUILD_DEPENDS=	tx:${PORTSDIR}/lang/t3x
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-MAKE_ENV+=	T3XDIR=/usr/local/t3x/r7
+ONLY_FOR_ARCHS=	i386
+
+MAKE_ENV+=	T3XDIR=${LOCALBASE}/t3x/r8
 
 do-configure:
-	@(cd ${WRKSRC}; ${LN} Makefile.UNX Makefile)
-	@(cd ${WRKSRC}/T3Xtools; ${LN} Makefile.UNX Makefile)
+	@(cd ${WRKSRC}; make unix)
 
 .include <bsd.port.mk>
diff --git a/devel/tide/distinfo b/devel/tide/distinfo
index c82f1fb42618..591a7dceea4c 100644
--- a/devel/tide/distinfo
+++ b/devel/tide/distinfo
@@ -1 +1 @@
-MD5 (tide-16.tar.gz) = 57075b18d96caf327fe843d921ca072d
+MD5 (tide-204.tar.gz) = d3e1da91294b445b8a32d89be6871c6d
diff --git a/devel/tide/pkg-descr b/devel/tide/pkg-descr
index 8abc5f7b67b6..1291107092b1 100644
--- a/devel/tide/pkg-descr
+++ b/devel/tide/pkg-descr
@@ -1,23 +1,19 @@
-TIDE is the T3X Integrated Development Environment. Basically, it
-is a text editor with an integrated interface to the T3X compiler.
-T3X 7.0 or a later version is required to run this version of TIDE.
-The main purposes of TIDE are:
+TIDE is a collection of tools and add-on classes for the T3X
+compiler. It includes
 
-. editing source programs
-. compiling programs without leaving the editor
-. locating formal errors
-. running programs
+- TIDE, the T3X Integrated Development Environment
+- SDFMT, a structured document (re-)formatter
 
-T3Xtools is a set of classes which provides some frequently
-used functionality like
+as well as tool classes for the following tasks:
 
-. managing configuration files
-. visually and non-visually editing ASCII text
-. navigating directory trees and selecting files
-. displaying and editing forms
-. presenting menu boxes and prompt boxes
+- configuration file management
+- visual ASCII editing
+- non-visual ASCII editing
+- directory navigation and file selection
+- on-screen forms
+- menues
+- one-line prompts
+- structured I/O
+- file services (copying/moving files, etc)
 
-WWW: http://www.t3x.org/
-
---
-Nils M Holm <nmh@t3x.org>
+WWW: http://www.t3x.org/T3X/
diff --git a/devel/tide/pkg-plist b/devel/tide/pkg-plist
index 8f74690d3457..ee4d7a533d29 100644
--- a/devel/tide/pkg-plist
+++ b/devel/tide/pkg-plist
@@ -1,46 +1,68 @@
+bin/sdfmt
 bin/tide
-t3x/r7/classes/config.cls
-t3x/r7/classes/config.dir
-t3x/r7/classes/editor.cls
-t3x/r7/classes/editor.dir
-t3x/r7/classes/filebox.cls
-t3x/r7/classes/filebox.dir
-t3x/r7/classes/form.cls
-t3x/r7/classes/form.dir
-t3x/r7/classes/menu.cls
-t3x/r7/classes/menu.dir
-t3x/r7/classes/prompt.cls
-t3x/r7/classes/prompt.dir
-t3x/r7/classes/tblio.cls
-t3x/r7/classes/tblio.dir
-t3x/r7/classes/vedit.cls
-t3x/r7/classes/vedit.dir
-t3x/r7/doc/tide.sd
-t3x/r7/doc/tools.sd
-t3x/r7/tide.rc
-t3x/r7/tide/default.cs
-t3x/r7/tide/examples/apfel.t
-t3x/r7/tide/examples/fac.t
-t3x/r7/tide/examples/hello.t
-t3x/r7/tide/examples/hello2.t
-t3x/r7/tide/examples/hello3.t
-t3x/r7/tide/examples/permute.t
-t3x/r7/tide/examples/primes.t
-t3x/r7/tide/examples/ttt.t
-t3x/r7/tide/helpfile
-t3x/r7/tide/monochrm.cs
-t3x/r7/tide/tide
-@exec echo 'config:t3x,iostream,string,ttyctl' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'editor:t3x,string' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'tblio:t3x,string,iostream' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'filebox:t3x,string,system,ttyctl' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'form:t3x,ttyctl,menu,prompt' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'menu:t3x,string,ttyctl' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'prompt:t3x,string,ttyctl' >>%D/t3x/r7/classes/CLASSNDX
-@exec echo 'vedit:t3x,string,ttyctl,editor' >>%D/t3x/r7/classes/CLASSNDX
-@exec sh -c 'if ! grep -q tools.sd %D/t3x/r7/doc/sdv-config; then echo "file		=	tools.sd [THE T3XTOOLS CLASSES]">>%D/t3x/r7/doc/sdv-config; fi'
-@exec sh -c 'if ! grep -q tide.sd %D/t3x/r7/doc/sdv-config; then echo "file		=	tide.sd [TIDE DOCUMENTATION]" >>%D/t3x/r7/doc/sdv-config; fi'
-@unexec cp %D/t3x/r7/doc/sdv-config %D/t3x/r7/sdv.tmp && grep -v 'tools\.sd' %D/t3x/r7/sdv.tmp | grep -v 'tide\.sd' >%D/t3x/r7/doc/sdv-config && rm -f %D/t3x/r7/sdv.tmp
-@unexec sed -e '/^config:/,/^vedit:/d' <%D/t3x/r7/classes/CLASSNDX >%D/t3x/ndx.tmp && mv %D/t3x/ndx.tmp %D/t3x/r7/classes/CLASSNDX
-@dirrm t3x/r7/tide/examples
-@dirrm t3x/r7/tide
+t3x/r8/bin/sdfmt
+t3x/r8/classes/2/config.cls
+t3x/r8/classes/2/editor.cls
+t3x/r8/classes/2/filebox.cls
+t3x/r8/classes/2/filesrv.cls
+t3x/r8/classes/2/form.cls
+t3x/r8/classes/2/menu.cls
+t3x/r8/classes/2/prompt.cls
+t3x/r8/classes/2/pstruct.cls
+t3x/r8/classes/2/tblio.cls
+t3x/r8/classes/2/vedit.cls
+t3x/r8/classes/config.cls
+t3x/r8/classes/config.dir
+t3x/r8/classes/editor.cls
+t3x/r8/classes/editor.dir
+t3x/r8/classes/filebox.cls
+t3x/r8/classes/filebox.dir
+t3x/r8/classes/filesrv.cls
+t3x/r8/classes/filesrv.dir
+t3x/r8/classes/form.cls
+t3x/r8/classes/form.dir
+t3x/r8/classes/menu.cls
+t3x/r8/classes/menu.dir
+t3x/r8/classes/prompt.cls
+t3x/r8/classes/prompt.dir
+t3x/r8/classes/pstruct.cls
+t3x/r8/classes/pstruct.dir
+t3x/r8/classes/tblio.cls
+t3x/r8/classes/tblio.dir
+t3x/r8/classes/vedit.cls
+t3x/r8/classes/vedit.dir
+t3x/r8/doc/tide.sd
+t3x/r8/doc/tool-changes.sd
+t3x/r8/doc/tool-classes.sd
+t3x/r8/doc/tool-commands.sd
+t3x/r8/examples/apfel.t
+t3x/r8/examples/bottles.t
+t3x/r8/examples/fac.t
+t3x/r8/examples/hello.t
+t3x/r8/examples/hello2.t
+t3x/r8/examples/hello3.t
+t3x/r8/examples/hello4.t
+t3x/r8/examples/permute.t
+t3x/r8/examples/primes.t
+t3x/r8/examples/ttt.t
+t3x/r8/examples/ttt_oo.t
+t3x/r8/examples/ttt_plain.t
+t3x/r8/tide.rc
+t3x/r8/tide/default.cs
+t3x/r8/tide/helpfile
+t3x/r8/tide/monochrm.cs
+t3x/r8/tide/tide
+@exec echo 'config:t3x,iostream,string,ttyctl' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'editor:t3x,string' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'tblio:t3x,string,iostream' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'filebox:t3x,string,system,ttyctl' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'filesrv:t3x,string' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'form:t3x,ttyctl,menu,prompt' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'menu:t3x,string,ttyctl' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'prompt:t3x,string,ttyctl' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'pstruct:t3x,char,string,iostream' >>%D/t3x/r8/classes/CLASSNDX
+@exec echo 'vedit:t3x,string,ttyctl,editor' >>%D/t3x/r8/classes/CLASSNDX
+@unexec sed -e '/^config:/,/^vedit:/d' <%D/t3x/r8/classes/CLASSNDX >%D/t3x/ndx.tmp && mv %D/t3x/ndx.tmp %D/t3x/r8/classes/CLASSNDX
+@unexec sed -e '/^config:/,/^vedit:/d' <%D/t3x/r8/classes/2/CLASSNDX >%D/t3x/ndx.tmp && mv %D/t3x/ndx.tmp %D/t3x/r8/classes/2/CLASSNDX
+@dirrm t3x/r8/examples
+@dirrm t3x/r8/tide