diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 660c2ddaada..ee1fe8f7c00 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,31 +1,28 @@
-# $OpenBSD: Makefile,v 1.3 1999/10/26 22:12:41 jasoni Exp $
+# $OpenBSD: Makefile,v 1.4 2000/01/25 05:56:48 jasoni Exp $
 # $FreeBSD Id: Makefile,v 1.2 1999/06/28 02:22:43 billf Exp $
 #
 
-DISTNAME=		Xfstt-0.9.10
-PKGNAME=		xfstt-0.9.10
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/fonts
-EXTRACT_SUFX=		.tgz
+DISTNAME=	xfstt-1.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR= X11/fonts
 
-MAINTAINER=		jasoni@openbsd.org
+MAINTAINER=	jasoni@openbsd.org
 
-WRKSRC=			${WRKDIR}/xfstt0910
-USE_X11=		yes
+USE_X11=	yes
 
 do-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/xfstt $(PREFIX)/bin
-	$(INSTALL_MAN) $(WRKSRC)/xfstt.1x $(PREFIX)/man/man1/xfstt.1
+	${INSTALL_PROGRAM} ${WRKSRC}/xfstt ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xfstt.1x ${PREFIX}/man/man1/xfstt.1
 
 post-install:
-	strip $(PREFIX)/bin/xfstt
-	$(MKDIR) $(PREFIX)/share/doc/xfstt
-	$(INSTALL_DATA) $(WRKSRC)/FAQ $(PREFIX)/share/doc/xfstt
-	$(INSTALL_DATA) $(WRKSRC)/CHANGES $(PREFIX)/share/doc/xfstt
-	$(INSTALL_DATA) $(WRKSRC)/INSTALL $(PREFIX)/share/doc/xfstt
-	$(INSTALL_DATA) $(WRKSRC)/THANKS.txt $(PREFIX)/share/doc/xfstt
-	${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${PREFIX}/share/doc/xfstt
+	strip ${PREFIX}/bin/xfstt
+	mkdir ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA} ${WRKSRC}/THANKS.txt ${PREFIX}/share/doc/xfstt
+	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/xfstt
 	@${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/x11/xfstt/files/README.OpenBSD b/x11/xfstt/files/README.OpenBSD
new file mode 100644
index 00000000000..6834bbcc791
--- /dev/null
+++ b/x11/xfstt/files/README.OpenBSD
@@ -0,0 +1,2 @@
+The font directory for OpenBSD has been changed from /usr/ttfonts/ to
+/usr/X11R6/lib/X11/fonts/TrueType/.
diff --git a/x11/xfstt/files/md5 b/x11/xfstt/files/md5
index ce4a619d9f9..5b83793ea84 100644
--- a/x11/xfstt/files/md5
+++ b/x11/xfstt/files/md5
@@ -1,3 +1,3 @@
-MD5 (Xfstt-0.9.10.tgz) = 9189cbcfb972fcc05e093aeccfd4d3b2
-RMD160 (Xfstt-0.9.10.tgz) = 91fc60d1c0a22c41ef508e0e103cdc6fd7c2d2ed
-SHA1 (Xfstt-0.9.10.tgz) = 07a32e90a1eb0514a8f516c027e68faaf79097fd
+MD5 (xfstt-1.0.tar.gz) = 1c5809f3f64c5000d86bed1baa25b616
+RMD160 (xfstt-1.0.tar.gz) = e6c93bc6e08222c744c1d594e509689ce6b4486f
+SHA1 (xfstt-1.0.tar.gz) = 51d6fe2561c6c1cf195fbc12f22f6559d033f172
diff --git a/x11/xfstt/patches/patch-ab b/x11/xfstt/patches/patch-ab
index 59088553138..b1e2872c06a 100644
--- a/x11/xfstt/patches/patch-ab
+++ b/x11/xfstt/patches/patch-ab
@@ -1,19 +1,13 @@
---- xfstt.cpp.orig	Sun Oct 25 11:21:12 1998
-+++ xfstt.cpp	Wed Dec 23 19:29:11 1998
-@@ -8,7 +8,7 @@
- // if you are sure your X11 server doesn't request more
- // than it can handle, increase the limit up to 65535
+--- xfstt.cpp.orig	Mon Jan 24 23:32:27 2000
++++ xfstt.cpp	Mon Jan 24 23:36:32 2000
+@@ -11,8 +11,8 @@
  #define UNSTRAPLIMIT	10500U
--#define TTFONTDIR	"/usr/ttfonts"
+ 
+ // Change these if you don't lie being FHS complient
+-#define TTFONTDIR	"/usr/share/fonts/truetype"
+-#define TTCACHEDIR      "/var/cache/xfstt"
 +#define TTFONTDIR	"/usr/X11R6/lib/X11/fonts/TrueType"
++#define TTCACHEDIR      "/usr/X11R6/lib/X11/fonts/TrueType"
  
- #define MAXOPENFONTS 256
- #define MAXREPLYSIZE (1<<22)
-@@ -22,6 +22,7 @@
- #include "ttfn.h"
- #include "encoding.h"
- 
-+#include <sys/types.h>
- #include <dirent.h>
- #include <string.h>
- #include <ctype.h>
+ #define TTINFO_LEAF     "ttinfo.dir"
+ #define TTNAME_LEAF     "ttname.dir"
diff --git a/x11/xfstt/patches/patch-ac b/x11/xfstt/patches/patch-ac
index 7bedac07abf..5a11bd0d389 100644
--- a/x11/xfstt/patches/patch-ac
+++ b/x11/xfstt/patches/patch-ac
@@ -1,10 +1,10 @@
---- perftest.cpp.orig	Wed Dec 23 21:21:45 1998
-+++ perftest.cpp	Wed Dec 23 21:22:15 1998
+--- perftest.cpp.orig	Mon Jan 24 23:37:20 2000
++++ perftest.cpp	Mon Jan 24 23:37:40 2000
 @@ -1,7 +1,7 @@
  // test ttf engine performance
  // (C) Copyright 1997-1998 Herbert Duerr
  
--#define TTFONTDIR	"/usr/ttfonts"
+-#define TTFONTDIR	"/usr/share/fonts/truetype"
 +#define TTFONTDIR	"/usr/X11R6/lib/X11/fonts/TrueType"
  #define MAXFONTBUFSIZE (2048*2048)
  
diff --git a/x11/xfstt/patches/patch-ad b/x11/xfstt/patches/patch-ad
deleted file mode 100644
index d33767db6f6..00000000000
--- a/x11/xfstt/patches/patch-ad
+++ /dev/null
@@ -1,5 +0,0 @@
---- README.OpenBSD.orig	Mon Jul 12 02:22:11 1999
-+++ README.OpenBSD	Mon Jul 12 02:22:44 1999
-@@ -0,0 +1,2 @@
-+The font directory for OpenBSD has been changed from /usr/ttfonts/ to
-+/usr/X11R6/lib/X11/fonts/TrueType/.