diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 6eccd01414a..184d77aa7a0 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2005/09/04 23:28:43 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2006/04/09 11:10:08 alek Exp $
 #
 
 COMMENT=	"Jonathan's Own Version of Emacs"
 
 DISTNAME=	jove-4.16
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	editors
 
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/
diff --git a/editors/jove/patches/patch-Makefile b/editors/jove/patches/patch-Makefile
index 08a53e92b77..a9adb481b87 100644
--- a/editors/jove/patches/patch-Makefile
+++ b/editors/jove/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1 2006/04/09 10:10:25 alek Exp $
---- Makefile.orig	Tue Mar 19 05:44:33 1996
-+++ Makefile	Sun Apr  9 12:05:56 2006
+$OpenBSD: patch-Makefile,v 1.2 2006/04/09 11:10:09 alek Exp $
+--- Makefile.orig	Tue Mar 19 06:44:33 1996
++++ Makefile	Mon Mar 13 08:51:30 2006
 @@ -27,16 +27,16 @@
  # LIBDIR and SHAREDIR.  All others must already exist.
  
@@ -98,25 +98,33 @@ $OpenBSD: patch-Makefile,v 1.1 2006/04/09 10:10:25 alek Exp $
  
  $(LIBDIR)::
  	test -d $(LIBDIR) || mkdir $(LIBDIR)
-@@ -375,9 +379,8 @@ $(JOVEM): doc/jove.nr
+@@ -373,11 +377,10 @@ $(TEACHJOVE): teachjove
+ 
+ $(JOVEM): doc/jove.nr
  	@sed -e 's;<TMPDIR>;$(TMPDIR);' \
- 	     -e 's;<LIBDIR>;$(LIBDIR);' \
- 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
+-	     -e 's;<LIBDIR>;$(LIBDIR);' \
+-	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
 -	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > /tmp/jove.nr
 -	$(TINSTALL) /tmp/jove.nr $(JOVEM)
 -	rm /tmp/jove.nr
++	     -e 's;<LIBDIR>;${LOCALBASE}/libexec/jove;' \
++	     -e 's;<SHAREDIR>;${LOCALBASE}/share/jove;' \
 +	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > jove.$(MANEXT)
 +	$(TINSTALL) jove.$(MANEXT) $(JOVEM)
  
  # doc/jove.doc is the formatted manpage (only needed by DOS)
  # Building it should be like building $(JOVEM) except that we
-@@ -391,18 +394,16 @@ $(TEACHJOVEM): doc/teachjove.nr
+@@ -389,20 +392,18 @@ doc/jove.doc: doc/jove.nr
+ 
+ $(TEACHJOVEM): doc/teachjove.nr
  	@sed -e 's;<TMPDIR>;$(TMPDIR);' \
- 	     -e 's;<LIBDIR>;$(LIBDIR);' \
- 	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
+-	     -e 's;<LIBDIR>;$(LIBDIR);' \
+-	     -e 's;<SHAREDIR>;$(SHAREDIR);' \
 -	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > /tmp/teachjove.nr
 -	$(TINSTALL) /tmp/teachjove.nr $(TEACHJOVEM)
 -	rm /tmp/teachjove.nr
++	     -e 's;<LIBDIR>;${LOCALBASE}/libexec/jove;' \
++	     -e 's;<SHAREDIR>;${LOCALBASE}/share/jove;' \
 +	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > teachjove.$(MANEXT)
 +	$(TINSTALL) teachjove.$(MANEXT) $(TEACHJOVEM)
  
diff --git a/editors/jove/patches/patch-sysdep_h b/editors/jove/patches/patch-sysdep_h
new file mode 100644
index 00000000000..956a6dcc1c5
--- /dev/null
+++ b/editors/jove/patches/patch-sysdep_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-sysdep_h,v 1.1 2006/04/09 11:10:09 alek Exp $
+--- sysdep.h.orig	Tue Mar 19 05:44:33 1996
++++ sysdep.h	Sun Apr  9 13:03:06 2006
+@@ -568,7 +568,8 @@
+ #endif
+ 
+ #ifndef MSDOS	/* maximum path length (including '\0') */
+-# define FILESIZE	256
++# include <sys/param.h>
++# define FILESIZE	MAXPATHLEN
+ #else /* MSDOS */
+ # define FILESIZE	128	/* currently, 2+1+64+3+1+3+1 == 80 ought to be OK */
+ #endif /* MSDOS */