diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 316dfc864c43..ffb380d79963 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnuplot
 PORTVERSION=	3.7.3
+PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	chuckr@FreeBSD.org
 COMMENT=	A command-driven interactive function plotting program
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
+CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--without-linux-vga --without-gd \
 		--with-readline=gnu --with-lasergnu
 
@@ -37,7 +38,7 @@ CONFIGURE_ARGS+=	--without-png
 .endif
 
 .if !defined(WITHOUT_PDF)
-LIB_DEPENDS+=	pdf.4:${PORTSDIR}/print/pdflib
+LIB_DEPENDS+=	pdf.5:${PORTSDIR}/print/pdflib
 CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-pdf
@@ -48,8 +49,6 @@ post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.gih ${DATADIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index d95950576205..265d65e6e06f 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,9 +1,9 @@
 bin/gnuplot
 %%X11:%%bin/gnuplot_x11
 bin/lasergnu
-%%PORTDOCS%%@unexec install-info --delete %D/info/gnuplot.info %D/info/dir
-%%PORTDOCS%%info/gnuplot.info
-%%PORTDOCS%%@exec install-info %D/info/gnuplot.info %D/info/dir
+@unexec install-info --delete %D/info/gnuplot.info %D/info/dir
+info/gnuplot.info
+@exec install-info %D/info/gnuplot.info %D/info/dir
 %%PORTDOCS%%share/examples/gnuplot/1.dat
 %%PORTDOCS%%share/examples/gnuplot/2.dat
 %%PORTDOCS%%share/examples/gnuplot/3.dat
@@ -70,5 +70,5 @@ bin/lasergnu
 %%PORTDOCS%%share/examples/gnuplot/world.dat
 %%PORTDOCS%%share/examples/gnuplot/world.dem
 %%PORTDOCS%%@dirrm share/examples/gnuplot
-%%PORTDOCS%%share/gnuplot/gnuplot.gih
-%%PORTDOCS%%@dirrm share/gnuplot
+share/gnuplot/gnuplot.gih
+@dirrm share/gnuplot