diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 104c708c1a9..cd61961a5c6 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,17 +1,14 @@
-# $OpenBSD: Makefile,v 1.5 1999/04/01 06:20:08 brad Exp $
+# $OpenBSD: Makefile,v 1.6 1999/11/05 08:54:41 kevlo Exp $
 
-DISTNAME=	beav_140-7
-PKGNAME=	beav-1.40.7
+DISTNAME=	beav_1.40-13
+PKGNAME=	beav-1.40-13
 CATEGORIES=	editors
 
-#BROKEN=	"sources moved and/or no longer available"
+MAINTAINER=	kevlo@openbsd.org
 
-MAINTAINER=	ports@openbsd.org
+MASTER_SITES=	ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
 
-MASTER_SITES=	ftp://ftp.debian.org/debian/bo/source/editors/ \
-		ftp://theta.iis.u-tokyo.ac.jp/pub2/Linux/distributions/debian/bo/source/editors/
-
-WRKSRC=		${WRKDIR}/beav-140
+WRKSRC=		${WRKDIR}/beav-1.40
 PATCH_STRIP=	-p1
 
 .include <bsd.port.mk>
diff --git a/editors/beav/files/md5 b/editors/beav/files/md5
index 09bbc92f232..26467ca4660 100644
--- a/editors/beav/files/md5
+++ b/editors/beav/files/md5
@@ -1,3 +1,3 @@
-MD5 (beav_140-7.tar.gz) = 374a7dd0efea5dc0b4e3d9586427bcdb
-RMD160 (beav_140-7.tar.gz) = 16de22be7c4ea3a3c0492f12c0956bef99e40fc5
-SHA1 (beav_140-7.tar.gz) = bde954eda8dba186e3584dbd097485616a0d72ef
+MD5 (beav_1.40-13.tar.gz) = ab8df8acd024d4ae3bd2bdd3e1b85031
+RMD160 (beav_1.40-13.tar.gz) = 38a66eb9a94243fa671f0c6b35f7bc2bfab7e06f
+SHA1 (beav_1.40-13.tar.gz) = 284fca0bfdf1ab143953cd2bc77c57f8eaa4a931
diff --git a/editors/beav/patches/patch-a b/editors/beav/patches/patch-a
index 7d822a83ac8..57651203ddf 100644
--- a/editors/beav/patches/patch-a
+++ b/editors/beav/patches/patch-a
@@ -1,46 +1,35 @@
-diff -c beav-140.orig/Makefile beav-140/Makefile
-*** beav-140.orig/Makefile	Wed Nov 30 19:19:47 1994
---- beav-140/Makefile	Sat Jul  1 18:07:14 1995
-***************
-*** 1,5 ****
-  # This is the makefile for BSD UNIX
-! CFLAGS=     -O2 -DUNIX -DNOPROTO
-  
-  OFILES=		basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
-  	buffer.o echo.o language.o main.o search.o tty.o window.o \
---- 1,5 ----
-  # This is the makefile for BSD UNIX
-! CFLAGS+=     -DUNIX -DNOPROTO -DBSD
-  
-  OFILES=		basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
-  	buffer.o echo.o language.o main.o search.o tty.o window.o \
-***************
-*** 14,20 ****
-  
-  HFILES=     def.h
-  
-! beav:     $(OFILES)
-  	$(CC) $(CFLAGS) $(OFILES) -s -ltermcap -lc -o beav
-  
-! (OFILES):  $(HFILES)
---- 14,27 ----
-  
-  HFILES=     def.h
-  
-! all beav:     $(OFILES)
-  	$(CC) $(CFLAGS) $(OFILES) -s -ltermcap -lc -o beav
-  
-! install: beav
-! 	install -c -s -m 755 -g bin -o bin beav $(PREFIX)/bin
-! 	mkdir -p $(PREFIX)/share/doc/beav
-! 	install -c -m 644 -g bin -o bin beav140.txt $(PREFIX)/share/doc/beav/beav.txt
-! 	install -c -m 644 -g bin -o bin beav.1 $(PREFIX)/man/man1
-! 	gzip -9nf $(PREFIX)/man/man1/beav.1
-! 
-! $(OFILES):  $(HFILES)
-diff -c beav-140.orig/termio.c beav-140/termio.c
+--- Makefile.orig	Sat Dec 13 09:34:59 1997
++++ Makefile	Mon Aug 10 10:45:21 1998
+@@ -1,6 +1,6 @@
+ # This is the makefile for BSD UNIX
+ #CFLAGS=     -g -DUNIX
+-CFLAGS=     -O2 -DUNIX
++CFLAGS+=     -DUNIX -DBSD
+ CC=gcc
+ 
+ OFILES=		basic.o ebcdic.o fileio.o region.o text.o wangpc.o \
+@@ -16,10 +16,16 @@
+ 
+ HFILES=     def.h prototyp.h
+ 
+-beav:     $(OFILES)
+-	$(CC) $(CFLAGS) $(OFILES) -lncurses -o beav
++all beav:     $(OFILES)
++	$(CC) $(CFLAGS) $(OFILES) -ltermcap -o beav
++
++install: beav
++	$(BSD_INSTALL_PROGRAM) beav $(PREFIX)/bin
++	mkdir -p $(PREFIX)/share/doc/beav
++	$(BSD_INSTALL_DATA) beav140.txt $(PREFIX)/share/doc/beav/beav.txt
++	$(BSD_INSTALL_MAN) beav.1 $(PREFIX)/man/man1
+ 
+ clean:
+ 	rm -f *.o beav
+ 
+-(OFILES):  $(HFILES)
++$(OFILES):  $(HFILES)
 *** beav-140.orig/termio.c	Wed Nov 30 18:43:35 1994
---- beav-140/termio.c	Sat Jul  1 17:56:09 1995
+--- termio.c	Sat Jul  1 17:56:09 1995
 ***************
 *** 12,17 ****
 --- 12,20 ----
@@ -53,9 +42,8 @@ diff -c beav-140.orig/termio.c beav-140/termio.c
   #else
   #ifdef OS2
   #ifndef __EMX__
-diff -c beav-140.orig/tcap.c beav-140/tcap.c
 *** beav-140.orig/tcap.c	Sat Jul  1 18:32:02 1995
---- beav-140/tcap.c	Sat Jul  1 18:24:29 1995
+--- tcap.c	Sat Jul  1 18:24:29 1995
 ***************
 *** 38,44 ****
   
@@ -73,9 +61,8 @@ diff -c beav-140.orig/tcap.c beav-140/tcap.c
   #endif /* BSD */
   #ifdef ULTRIX
   struct winsize ttysize;
-diff -c beav-140.orig/beav.1 beav-140/beav.1
 *** beav-140.orig/beav.1	Sun Mar  3 03:13:16 1996
---- beav-140/beav.1	Sun Mar  3 03:14:31 1996
+--- beav.1	Sun Mar  3 03:14:31 1996
 ***************
 *** 59,63 ****
   If there is any data that has not been saved you will be warned.