diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index 54ebaf7d7d7..8b05b18f763 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.8 2000/03/12 00:25:21 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/04/18 23:56:26 espie Exp $
 
 DISTNAME=	gperf-2.7
-PKGNAME=	gperf-2.7-19981006
+PKGNAME=	gperf-2.7.19981006
 CATEGORIES=   	devel
 NEED_VERSION=	1.223
 
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index ca3093570ce..db370a5ba0c 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -5,11 +5,11 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp $
-# $OpenBSD: Makefile,v 1.8 2000/03/27 01:08:55 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/04/18 23:56:26 espie Exp $
 #
 
 DISTNAME=	less-332
-PKGNAME=	ja-less-332-248
+PKGNAME=	ja-less-3.32p2.48
 CATEGORIES=	japanese
 NEED_VERSION=	1.175
 MASTER_SITES=	${MASTER_SITE_GNU}
diff --git a/net/epic4/Makefile b/net/epic4/Makefile
index 300966af992..69d59c41145 100644
--- a/net/epic4/Makefile
+++ b/net/epic4/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2000/04/01 09:05:57 brad Exp $
+# $OpenBSD: Makefile,v 1.18 2000/04/18 23:56:26 espie Exp $
 # $FreeBSD: Makefile,v 1.13 1999/03/01 16:18:30 mph Exp $
 
 DISTNAME=	epic4pre2.507
+PKGNAME=	epic4-pre2.507
 CATEGORIES=	net
 NEED_VERSION=	1.234
 MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-ALPHA/ \
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 262f0df295d..01bd2d67095 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2000/03/24 10:44:32 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2000/04/18 23:56:26 espie Exp $
 
 BROKEN=		"Default floppy names are wrong"
 DATE=		19991121
 DISTNAME=	mtools-3.9.6
-PKGNAME=	mtools-3.9.6-${DATE}
+PKGNAME=	mtools-3.9.6.${DATE}
 CATEGORIES=	sysutils
 NEED_VERSION=	1.175
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/