diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index f3ca0379bfd..772034dbf08 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2004/05/04 11:31:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2004/10/31 10:38:57 alek Exp $
 
 COMMENT=		"graphical representation of CVS repository"
 
-DISTNAME=		cvsgraph-1.2.0
+DISTNAME=		cvsgraph-1.5.1
 CATEGORIES=		devel
 HOMEPAGE=		http://www.akhphd.au.dk/~bertho/cvsgraph
 
-MAINTAINER=	Aleksander Piotrowski <aleksander.piotrowski@nic.com.pl>
+MAINTAINER=	Aleksander Piotrowski <alek@openbsd.org>
 
 # GPL 2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -16,24 +16,21 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}/release/
 
-LIB_DEPENDS=		gd.18::graphics/gd \
-			jpeg::graphics/jpeg \
-			png::graphics/png
+LIB_DEPENDS=		gd.18::graphics/gd
 
 ALL_TARGET=		
 
 CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lttf -lm"
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
+			LIBS="-lpng -lttf -ljpeg -lz"
 CONFIGURE_ARGS=		--with-gd-inc=${LOCALBASE}/include \
 			--with-gd-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-jpeg-inc=${LOCALBASE}/include \
-			--with-jpeg-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-png-inc=${LOCALBASE}/include \
-			--with-png-lib=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-z-inc=/usr/include --with-z-lib=/usr/lib
 
 NO_REGRESS=		Yes
 
+pre-build:
+	@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' ${WRKSRC}/cvsgraph.1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsgraph ${PREFIX}/bin	
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsgraph
diff --git a/devel/cvsgraph/distinfo b/devel/cvsgraph/distinfo
index 0ab78378069..065a0d1a84e 100644
--- a/devel/cvsgraph/distinfo
+++ b/devel/cvsgraph/distinfo
@@ -1,3 +1,3 @@
-MD5 (cvsgraph-1.2.0.tar.gz) = ac1bc46e50df09106a210a878ee94452
-RMD160 (cvsgraph-1.2.0.tar.gz) = 86b0fda4175dad90be25e2f5910341d76fd284ea
-SHA1 (cvsgraph-1.2.0.tar.gz) = d953bb3db4c183e1c71a76c18acb9fbcdfdce342
+MD5 (cvsgraph-1.5.1.tar.gz) = 2f01dc06685581ac03bac38e08bf3b29
+RMD160 (cvsgraph-1.5.1.tar.gz) = 989e630660f75af33868929e57c5368278f4e813
+SHA1 (cvsgraph-1.5.1.tar.gz) = a8813be6c679168e3d644556d3712d1c5e9bf919
diff --git a/devel/cvsgraph/patches/patch-cvsgraph_1 b/devel/cvsgraph/patches/patch-cvsgraph_1
new file mode 100644
index 00000000000..80289b98543
--- /dev/null
+++ b/devel/cvsgraph/patches/patch-cvsgraph_1
@@ -0,0 +1,21 @@
+$OpenBSD: patch-cvsgraph_1,v 1.1 2004/10/31 10:38:57 alek Exp $
+--- cvsgraph.1.orig	Sat Oct 23 12:25:53 2004
++++ cvsgraph.1	Sat Oct 23 12:26:24 2004
+@@ -102,7 +102,7 @@ Use \fItxt\fR for expansion
+ option is given on the command line, then it is read. Otherwise, \fBcvsgraph\fR 
+ first looks for a configuration file in the current directory using
+ \fI./cvsgraph.conf\fR and, if not found, tries to open
+-\fI/usr/local/etc/cvsgraph.conf\fR. Defaults and command line overrides
++\fI!!SYSCONFDIR!!/cvsgraph.conf\fR. Defaults and command line overrides
+ will be used if no configuration file can be opened. The format of the
+ configuration file is described in \fBcvsgraph.conf(5)\fR. Configuration
+ parameters entered on the command line have always precedence over the
+@@ -158,7 +158,7 @@ generation.
+ .SH "FILES"
+ .LP
+ .TP
+-\fI/usr/local/etc/cvsgraph.conf\fR
++\fI!!SYSCONFDIR!!/cvsgraph.conf\fR
+ Configuration file read for default layout parameters.
+ .SH "AUTHOR"
+ \fBCvsGraph\fR is written and maintained by B. Stultiens.