diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 3695d3404bd..e086618e4e9 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -1,13 +1,8 @@
-# OpenBSD makefile for:		agrep
-# Version required:     	  2.04
-# Date created:			  December 1, 1997
-# Whom:				  Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.7 2000/10/22 15:43:33 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.8 2000/10/24 01:34:02 naddy Exp $
 
 DISTNAME=	agrep-2.04
 CATEGORIES=	textproc
+NEED_VERSION=	1.340
 NO_CDROM=	"NOFEE:	Can not sell"
 
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,13 +12,12 @@ PERMIT_DISTFILES_CDROM=	No
 
 MASTER_SITES=	ftp://ftp.cs.arizona.edu/agrep/
 EXTRACT_SUFX=	.tar.Z
-#DISTFILES=	${DISTNAME}.${EXTRACT_SUFX} agrep.ps.1.Z  agrep.ps.2.Z
 
 MAINTAINER=     Angelos D. Keromytis <angelos@openbsd.org>
 
 ALL_TARGET=
 MAN1=		agrep.1
-MAKE_FLAGS=	CFLAGS=${CFLAGS}
+MAKE_FLAGS=	CFLAGS='${CFLAGS}'
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/agrep ${PREFIX}/bin
diff --git a/textproc/agrep/pkg/DESCR b/textproc/agrep/pkg/DESCR
index c1c62fbf1da..fdef33ad80f 100644
--- a/textproc/agrep/pkg/DESCR
+++ b/textproc/agrep/pkg/DESCR
@@ -39,7 +39,3 @@ Two technical papers describing agrep are available as:
 	agrep.ps.2 is a copy of the paper as appeared in the 1992 Winter
 	USENIX conference.
 		ftp://ftp.cs.arizona.edu/agrep/agrep.ps.2.Z
-
-
-- David O'Brien
-obrien@NUXI.com
diff --git a/textproc/agrep/pkg/PLIST b/textproc/agrep/pkg/PLIST
index bdd1e4d4c5e..377318fa675 100644
--- a/textproc/agrep/pkg/PLIST
+++ b/textproc/agrep/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/10/24 01:34:02 naddy Exp $
 @pkgcfl glimpse-*
 bin/agrep
 man/man1/agrep.1