diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index ee2c48163511..22897989bf77 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/04/17 01:14:19 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/06/25 17:09:27 adrianp Exp $
 #
 
-DISTNAME=		gnuplot-3.7.3
+DISTNAME=		gnuplot-4.0.0
 PKGNAME=                ${DISTNAME:C/-/-nox11-/}
 SVR4_PKGNAME=		gplot
 CATEGORIES=		graphics
@@ -10,8 +10,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
 			ftp://ftp.cc.monash.edu.au/pub/gnuplot/
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://sourceforge.net/projects/gnuplot/
-COMMENT=		Gnuplot is a nice plotting utility
+HOMEPAGE=		http://gnuplot.sourceforge.net/
+COMMENT=		Portable interactive, function plotting utility 
 
 CONFLICTS+=		gnuplot-[0-9]*
 
@@ -20,7 +20,8 @@ USE_BUILDLINK3=		YES
 USE_GNU_READLINE=	YES
 GNU_CONFIGURE=		YES
 
-INFO_FILES=	gnuplot.info
+USE_MAKEINFO=		YES
+INFO_FILES=		gnuplot.info
 
 CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
@@ -29,6 +30,6 @@ CONFIGURE_ARGS+=	--without-x
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/plotutils-nox11/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnuplot-nox11/PLIST b/graphics/gnuplot-nox11/PLIST
index b3d638539c96..6184def8c69a 100644
--- a/graphics/gnuplot-nox11/PLIST
+++ b/graphics/gnuplot-nox11/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/17 23:51:13 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/06/25 17:09:27 adrianp Exp $
 bin/gnuplot
 man/man1/gnuplot.1
-share/gnuplot.gih
+share/gnuplot/4.0/gnuplot.gih
+@dirrm share/gnuplot/4.0
+@dirrm share/gnuplot
+@exec ${MKDIR} %D/libexec/gnuplot/4.0
+@dirrm libexec/gnuplot/4.0
+@dirrm libexec/gnuplot
diff --git a/graphics/gnuplot-nox11/distinfo b/graphics/gnuplot-nox11/distinfo
index 7e177b7b89dc..888855272e6f 100644
--- a/graphics/gnuplot-nox11/distinfo
+++ b/graphics/gnuplot-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2003/06/07 17:39:25 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2004/06/25 17:09:27 adrianp Exp $
 
-SHA1 (gnuplot-3.7.3.tar.gz) = 8e077efa1b6804020adfce62b4c5a1c391ca3d2d
-Size (gnuplot-3.7.3.tar.gz) = 1418889 bytes
+SHA1 (gnuplot-4.0.0.tar.gz) = a862bc311724c263aa1ef1c646291d73dc37c978
+Size (gnuplot-4.0.0.tar.gz) = 2160918 bytes