diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 0a567831d187..46560bc82b0b 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	epstool
-# Version required:	1.06
+# Version required:	1.08
 # Date created:		23 October 1999
 # Whom:			Yuzo FURUKAWA <hurukawa@kuee.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	epstool-106
-PKGNAME=	epstool-1.06
+DISTNAME=	epstool-108
+PKGNAME=	epstool-1.08
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/rjl/ \
-		ftp://ftp.fh-koblenz.de/pub/Ghostscript/rjl/
+MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/ghostgum/ \
+		ftp://ftp.fh-koblenz.de/pub/Ghostscript/ghostgum/
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -20,7 +20,9 @@ MAKEFILE=	makefile.unx
 WRKSRC=		${WRKDIR}/epstool
 
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/epstool
-	${INSTALL_DATA} ${WRKSRC}/epstool.txt ${PREFIX}/share/doc/epstool
+	${INSTALL_DATA} ${WRKSRC}/epstool.htm ${PREFIX}/share/doc/epstool
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/epstool/distinfo b/graphics/epstool/distinfo
index 9a3beaa0c6d4..6098e9cac9a5 100644
--- a/graphics/epstool/distinfo
+++ b/graphics/epstool/distinfo
@@ -1 +1 @@
-MD5 (epstool-106.tar.gz) = 1b86df4d4420995090867dcc3882febb
+MD5 (epstool-108.tar.gz) = b1ad618f11638c828ad56db120f4b97a
diff --git a/graphics/epstool/files/patch-aa b/graphics/epstool/files/patch-aa
index e62fe4ce5f52..e99640db8d18 100644
--- a/graphics/epstool/files/patch-aa
+++ b/graphics/epstool/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.unx.orig	Sun Aug 23 05:14:04 1998
-+++ makefile.unx	Tue Dec  7 00:50:56 1999
+--- makefile.unx.orig	Sat Dec  5 04:05:34 1998
++++ makefile.unx	Fri Feb 25 04:42:20 2000
 @@ -20,13 +20,13 @@
  RM=/bin/rm -f
  SHELL=/bin/sh
@@ -7,7 +7,7 @@
 -BINDIR=/usr/local/bin
 -INCLUDES=-I/usr/openwin/include
 +BINDIR=${PREFIX}/bin
-+INCLUDES=-I${X11BASE}/include
++INCLUDES=
  LIBS=
  # if you have a strict ANSI compiler, add -D__STDC__
  DEFINES=-DUNIX -DEPSTOOL -DHAVE_UNISTD_H
diff --git a/graphics/epstool/files/patch-ab b/graphics/epstool/files/patch-ab
index 716545b464ac..e0b07b792577 100644
--- a/graphics/epstool/files/patch-ab
+++ b/graphics/epstool/files/patch-ab
@@ -1,5 +1,5 @@
---- epstool.c.orig	Sun Sep 13 09:52:52 1998
-+++ epstool.c	Sat Oct 23 17:59:46 1999
+--- epstool.c.orig	Tue Feb 15 08:52:06 2000
++++ epstool.c	Fri Feb 25 04:09:56 2000
 @@ -25,7 +25,7 @@
  char upname[MAXSTR];
  char gsname[MAXSTR] = GSCOMMAND;
@@ -9,7 +9,7 @@
  char szScratch[] = "ep";
  char szAppName[] = "epstool";
  int resolution = 72;
-@@ -87,9 +87,9 @@
+@@ -90,9 +90,9 @@
  main(int argc, char *argv[])
  {
  #ifdef UNIX
@@ -21,7 +21,7 @@
  #endif
  	if (scan_args(argc, argv))
  	   return 1;
-@@ -252,10 +252,10 @@
+@@ -260,10 +260,10 @@
  	fclose(tempfile);
  #ifdef UNIX
  	sprintf(gscommand, "%s -dNOPAUSE -dQUIET -sDEVICE=%s -sOutputFile=\042%s\042 -r%d -g%dx%d %s",
@@ -34,7 +34,7 @@
  	if (!quiet) {
  	    fputs(gscommand, stderr);
  	    fputs("\n", stderr);
-@@ -409,7 +409,7 @@
+@@ -429,7 +429,7 @@
  		  break;
  		case 'z':
  		  if (argp[2])
@@ -43,3 +43,12 @@
  		  break;
  		case 'c':
  		  if (got_op) {
+@@ -566,7 +566,7 @@
+ 
+ 	strcat(fname, prefix);
+ 	strcat(fname, "XXXXXX");
+-	mktemp(fname);
++	mkstemp(fname);
+ 	return fopen(fname, mode);
+ }
+ 
diff --git a/graphics/epstool/pkg-plist b/graphics/epstool/pkg-plist
index b1932e2e2dde..5c0a333b57e3 100644
--- a/graphics/epstool/pkg-plist
+++ b/graphics/epstool/pkg-plist
@@ -1,3 +1,3 @@
 bin/epstool
-share/doc/epstool/epstool.txt
+share/doc/epstool/epstool.htm
 @dirrm share/doc/epstool