diff --git a/chinese/c2t/Makefile b/chinese/c2t/Makefile
index c8d86d73b66..65eba14fc05 100644
--- a/chinese/c2t/Makefile
+++ b/chinese/c2t/Makefile
@@ -1,13 +1,11 @@
-# OpenBSD makefile for:  c2t
-# Version required:     	  1.0
-# Date created:			  Nov 26, 1997
-# Whom:				  ejovi
-#
-# $OpenBSD: Makefile,v 1.1.1.1 1997/11/26 22:56:45 joey Exp $	
+# $OpenBSD: Makefile,v 1.2 1998/10/07 05:09:51 marc Exp $	
 #
 
-PKGNAME=	zh-c2t-1.0
+DISTNAME=	zh-c2t-1.0
 CATEGORIES=	chinese
+
+MAINTAINER=     joey@OpenBSD.ORG
+
 MASTER_SITES=	ftp://ftp.ifcss.org/pub/software/unix/convert/  \
 		ftp://ftp.ifcss.org/pub/software/x-win/cxterm/dict/gb/  \
 		ftp://ftp.edu.tw/Chinese/ifcss/software/unix/convert/  \
@@ -15,11 +13,9 @@ MASTER_SITES=	ftp://ftp.ifcss.org/pub/software/unix/convert/  \
 		ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/  \
 		ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/dict/gb/
 DISTFILES=	c2t.tar.gz TONEPY.tit
-
-MAINTAINER=     joey@OpenBSD.ORG
+EXTRACT_ONLY=	c2t.tar.gz
 
 NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	c2t.tar.gz
 MAN1=		c2t.1
 
 do-install:
diff --git a/chinese/lunar/Makefile b/chinese/lunar/Makefile
index eff7f775fd8..8f19929989f 100644
--- a/chinese/lunar/Makefile
+++ b/chinese/lunar/Makefile
@@ -1,21 +1,18 @@
-# OpenBSD makefile for:  lunar
-# Version required:     	  2.1
-# Date created:			  Nov 26 1997
-# Whom:				  ejovi
-#
-# $OpenBSD: Makefile,v 1.2 1998/04/10 05:38:29 marc Exp $
+# $OpenBSD: Makefile,v 1.3 1998/10/07 05:12:28 marc Exp $
 #
 
 DISTNAME=	lunar-2.1
 PKGNAME=	zh-lunar-2.1
 CATEGORIES=	chinese
+
 NO_CDROM=	"NOFEE:	Can not sell"
+
+MAINTAINER=     joey@OpenBSD.ORG
+
 MASTER_SITES=	ftp://ftp.ifcss.org/pub/software/unix/c-utils/  \
 		ftp://ftp.edu.tw/Chinese/ifcss/software/unix/c-utils/  \
 		ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/
 
-MAINTAINER=     joey@OpenBSD.ORG
-
 ALL_TARGET=
 MAN1=		lunar.1
 
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 271f8ca2c73..4f8cd367785 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -1,18 +1,14 @@
-# OpenBSD makefile for:	bpl+
-# Version required:		1.0
-# Date created:			31 Dec 1997
-# Whom:				ejovi
-#
-# $OpenBSD: Makefile,v 1.1.1.1 1997/12/31 18:36:18 joey Exp $
+# $OpenBSD: Makefile,v 1.2 1998/10/07 05:14:56 marc Exp $
 #
 
 DISTNAME=	bpl+
 PKGNAME=	bpl+-1.0
 CATEGORIES=	comms
-MASTER_SITES=	ftp://ftp.tohoku.ac.jp/pub/net/telnet/telnetx/
 
 MAINTAINER=	joey@OpenBSD.ORG
 
+MASTER_SITES=	ftp://ftp.tohoku.ac.jp/pub/net/telnet/telnetx/
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bpl ${PREFIX}/bin
 	@ln -fs ${PREFIX}/bin/bpl ${PREFIX}/bin/bp