diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index ea4a521dd66..72358221c35 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2000/09/23 12:51:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2000/11/18 13:37:54 naddy Exp $
 
-DISTNAME=	bvi-1.2.0
+DISTNAME=	bvi-1.3.0
 CATEGORIES=	editors
-NEED_VERSION=	1.334
-
+NEED_VERSION=	1.340
 HOMEPAGE=	http://bvi.linuxave.net
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -13,9 +12,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://bvi.linuxave.net/download/
+MASTER_SITES=	${HOMEPAGE}/download/
 EXTRACT_SUFX=	.src.tar.gz
 
-CONFIGURE_STYLE= gnu dest
+CONFIGURE_STYLE= gnu
+CFLAGS+=	-DANSI
 
 .include <bsd.port.mk>
diff --git a/editors/bvi/files/md5 b/editors/bvi/files/md5
index 382bb5c05fc..60a3ecd4e58 100644
--- a/editors/bvi/files/md5
+++ b/editors/bvi/files/md5
@@ -1,3 +1,3 @@
-MD5 (bvi-1.2.0.src.tar.gz) = 9508763dcb62f25b7b20016faf426d89
-RMD160 (bvi-1.2.0.src.tar.gz) = 4c28d00329cea660b5e1a993a332f08590c8740d
-SHA1 (bvi-1.2.0.src.tar.gz) = fc591885358ed7695234dfab6fc05c8aca210279
+MD5 (bvi-1.3.0.src.tar.gz) = af5e019e4e4ba9fcf1ffb9c24977b41b
+RMD160 (bvi-1.3.0.src.tar.gz) = 0b880aa9f423b0dc4fbdb02b328f401299ebac53
+SHA1 (bvi-1.3.0.src.tar.gz) = 4ed72d12f3f6eaf41722949f002a9492f5ee5052
diff --git a/editors/bvi/patches/patch-Makefile_in b/editors/bvi/patches/patch-Makefile_in
deleted file mode 100644
index e19f2efec29..00000000000
--- a/editors/bvi/patches/patch-Makefile_in
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2000/09/23 12:51:23 naddy Exp $
---- Makefile.in.orig	Fri Oct 22 11:27:36 1999
-+++ Makefile.in	Sat Sep 23 14:41:11 2000
-@@ -33,6 +33,7 @@ CFLAGS =  @CFLAGS@
- DEFS   =  @DEFS@
- LDFLAGS=  @LDFLAGS@
- LIBS   =  @LIBS@
-+SHELL  =  /bin/sh
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -49,7 +50,9 @@ bvi: $(OBJS)
- 
- install: all installdirs
- 	@echo "Installing bvi"
--	@$(INSTALL_PROGRAM) bvi.1 $(man2dir)
-+	@$(INSTALL_DATA) bvi.1 $(man2dir)
-+	@if [ -f $(man2dir)/bview.1 ]; then rm $(man2dir)/bview.1; fi
-+	@ln $(man2dir)/bvi.1 $(man2dir)/bview.1
- 	@$(INSTALL_PROGRAM) -s bvi $(bindir)
- 	@if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
- 	@if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
diff --git a/editors/bvi/patches/patch-io_c b/editors/bvi/patches/patch-io_c
deleted file mode 100644
index a2c6d54489d..00000000000
--- a/editors/bvi/patches/patch-io_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-io_c,v 1.1 2000/09/23 12:51:24 naddy Exp $
---- io.c.orig	Tue Nov  2 10:44:10 1999
-+++ io.c	Sat Sep 23 14:41:11 2000
-@@ -119,7 +119,7 @@ load(fname)
- 		} else if (S_ISBLK(buf.st_mode)) {
- 			filemode = BLOCK_SPECIAL;
- 		} else if (S_ISREG(buf.st_mode)) {
--			if ((unsigned long)buf.st_size > (unsigned long)SIZE_T_MAX) {
-+			if (buf.st_size > SIZE_T_MAX) {
- 				move(maxy, 0);
- 				endwin();
- 				printf("File too large\n");
diff --git a/editors/bvi/pkg/DESCR b/editors/bvi/pkg/DESCR
index fcbbfb3adf2..bc0117b70c9 100644
--- a/editors/bvi/pkg/DESCR
+++ b/editors/bvi/pkg/DESCR
@@ -1,3 +1,5 @@
 bvi (binary visual) is a display oriented binary editor based on
-the vi(1) texteditor. It uses commands similar to the commands of
+the vi(1) texteditor.  It uses commands similar to the commands of
 vi(1), with some changes due to their different tasks.
+
+WWW: ${HOMEPAGE}
diff --git a/editors/bvi/pkg/PLIST b/editors/bvi/pkg/PLIST
index d4b8ac3a782..c51f36630d7 100644
--- a/editors/bvi/pkg/PLIST
+++ b/editors/bvi/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/09/23 12:51:24 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2000/11/18 13:37:55 naddy Exp $
+bin/bmore
+bin/bvedit
 bin/bvi
 bin/bview
-bin/bvedit
 man/man1/bvi.1
-man/man1/bview.1
+man/man1/bmore.1
+share/bmore.help