diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 0cdd3ebac28..c86c5517ad9 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,30 +1,37 @@
-# $OpenBSD: Makefile,v 1.11 2000/04/08 22:04:32 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2000/09/22 20:34:56 danh Exp $
 
-DISTNAME=	gnuplot-3.7
-PKGNAME=	gnuplot-3.7
+DISTNAME=	gnuplot-3.7.1
 CATEGORIES=	math graphics
-NEED_VERSION=	 1.230
+NEED_VERSION=	1.333
 MASTER_SITES=	ftp://ftp.gnuplot.vt.edu/pub/gnuplot/ \
 		ftp://ftp.irisa.fr/pub/gnuplot/ \
 		ftp://ftp.cc.monash.edu.au/pub/gnuplot/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= gnuplot
 
-MAINTAINER=	angelos@openbsd.org
+HOMEPAGE=	http://www.gnuplot.org/
+
+LIB_DEPENDS=	png::graphics/png
+
+MAINTAINER=	danh@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	"no modify"
 PERMIT_PACKAGE_FTP=	"no modify"
 PERMIT_DISTFILES_CDROM=	"no modify"
 PERMIT_DISTFILES_FTP=	Yes
-FAKE=			Yes
 
-LIB_DEPENDS=	png::graphics/png
+FLAVORS=	no_x11
+FLAVOR?=
 
-HAS_CONFIGURE=	Yes
-CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
-CONFIGURE_ARGS+=	--exec-prefix='$$(prefix)' \
-		--includedir='$$(prefix)/include' --libdir='$$(prefix)/lib' \
-		--with-x --without-linux-vga --without-gd \
-		--with-gnu-readline --with-lasergnu --with-png 
+CONFIGURE_STYLE= gnu dest
+CONFIGURE_ARGS+= --without-linux-vga --without-gd \
+		 --with-png --with-gnu-readline --with-lasergnu 
+
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+= --without-x
+.else
+USE_X11=	Yes
+CONFIGURE_ARGS+= --with-x
+.endif
 
 .include <bsd.port.mk>
diff --git a/math/gnuplot/files/md5 b/math/gnuplot/files/md5
index 30ae1e17a14..afb31ed2a4c 100644
--- a/math/gnuplot/files/md5
+++ b/math/gnuplot/files/md5
@@ -1,3 +1,3 @@
-MD5 (gnuplot-3.7.tar.gz) = 18bbd384a991e7b20dbd2c29c239e90d
-RMD160 (gnuplot-3.7.tar.gz) = 03fb8171cff88c033bdf2366c83dd227afdf1324
-SHA1 (gnuplot-3.7.tar.gz) = 1a77efcee12a52aaaac25aa834c5851f9573decf
+MD5 (gnuplot-3.7.1.tar.gz) = 30798b4c14ea734969a86ee41a9c1dca
+RMD160 (gnuplot-3.7.1.tar.gz) = 4e83c5181106607292eef130e51ae5aa3ed5c15e
+SHA1 (gnuplot-3.7.1.tar.gz) = 34b3d9fd03fd5cfc048da78fed007e8946007e65
diff --git a/math/gnuplot/pkg/DESCR b/math/gnuplot/pkg/DESCR
index 84817d8c7f5..de10aef2ee2 100644
--- a/math/gnuplot/pkg/DESCR
+++ b/math/gnuplot/pkg/DESCR
@@ -28,3 +28,5 @@ Other devices can be added simply, but will require recompiling.
 Shell escapes and command line substitution.
 
 Output redirection.
+
+WWW: ${HOMEPAGE}
diff --git a/math/gnuplot/pkg/PLIST b/math/gnuplot/pkg/PLIST
index 4e3989875ee..4f0b83ea566 100644
--- a/math/gnuplot/pkg/PLIST
+++ b/math/gnuplot/pkg/PLIST
@@ -1,6 +1,6 @@
-bin/lasergnu
+@comment $OpenBSD: PLIST,v 1.7 2000/09/22 20:34:57 danh Exp $
 bin/gnuplot
-bin/gnuplot_x11
-share/gnuplot.gih
-man/man1/lasergnu.1
+bin/lasergnu
 man/man1/gnuplot.1
+man/man1/lasergnu.1
+share/gnuplot.gih