diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index edba40a738d..1bcefd950cf 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1998/10/08 23:06:21 marc Exp $
+# $OpenBSD: Makefile,v 1.4 1998/11/20 04:58:05 marc Exp $
 #
 
 DISTNAME=       jed0.98-7
@@ -9,7 +9,7 @@ MAINTAINER=     ports@OpenBSD.ORG
 
 MASTER_SITES=   ftp://space.mit.edu/pub/davis/jed/
 
-LIB_DEPENDS=	slang\\.0\\.993[6-9]:${PORTSDIR}/devel/libslang
+LIB_DEPENDS=	slang.1.22:${PORTSDIR}/devel/libslang
 
 # comment out the next line if you don't want the X version of JED.
 XJED=		xjed
@@ -30,18 +30,24 @@ post-install:
 .if defined(XJED)
 	strip ${PREFIX}/bin/xjed
 .endif
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib/jed/lib 
+	${INSTALL_DATA} ${WRKSRC}/lib/*.sl ${PREFIX}/lib/jed/lib 
+	${INSTALL_DATA} ${WRKSRC}/lib/*.hlp ${PREFIX}/lib/jed/lib 
+	${INSTALL_DATA} ${WRKSRC}/lib/*.com ${PREFIX}/lib/jed/lib 
+	${INSTALL_DATA} ${WRKSRC}/lib/jed.rc ${PREFIX}/lib/jed/lib 
+	${MKDIR} ${PREFIX}/lib/jed/lib/tm
+	${INSTALL_DATA} ${WRKSRC}/lib/tm/* ${PREFIX}/lib/jed/lib/tm 
 	${INSTALL_DATA} ${WRKSRC}/info/jed.* ${PREFIX}/info
 	rmdir ${PREFIX}/lib/jed/info
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/jed
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${WRKSRC}/doc/*.txt \
 		${PREFIX}/share/doc/jed
+	rmdir ${PREFIX}/lib/jed/doc
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
-	install-info --section="Miscellaneous" \
-		--entry="* JED: (jed).			JED editor documentation." \
+	install-info --section="Editors" \
+		--entry="* JED: (jed). 		JED editor documentation." \
 		${PREFIX}/info/jed.info ${PREFIX}/info/dir
 .endif
 
diff --git a/editors/jed/pkg/PLIST b/editors/jed/pkg/PLIST
index a48632e4631..4e317a5994f 100644
--- a/editors/jed/pkg/PLIST
+++ b/editors/jed/pkg/PLIST
@@ -1,14 +1,17 @@
+@cwd /usr/local
+@name jed-0.98.7
+@pkgdep libslang-1.2.2
 bin/jed
-bin/rgrep
 bin/xjed
-@unexec install-info --delete --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
+bin/rgrep
+@unexec /usr/bin/install-info --delete %D/info/jed.info %D/info/dir 
+info/jed.info
 info/jed.1in
 info/jed.2in
 info/jed.3in
-info/jed.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info --section="Miscellaneous" --entry="* JED: (jed).			JED editor documentation." %D/info/jed.info %D/info/dir
+@exec /usr/bin/install-info --section "Editors" --entry "* JED: (jed).		JED editor documentation" %D/info/jed.info %D/info/dir
 lib/jed/bin/getmail
+@dirrm lib/jed/bin
 lib/jed/lib/abbrev.sl
 lib/jed/lib/abbrmisc.sl
 lib/jed/lib/acompile.sl
@@ -23,6 +26,7 @@ lib/jed/lib/bytecomp.sl
 lib/jed/lib/cal.sl
 lib/jed/lib/cmisc.sl
 lib/jed/lib/cmode.sl
+lib/jed/lib/compat.sl
 lib/jed/lib/compile.sl
 lib/jed/lib/cpright.hlp
 lib/jed/lib/ctags.sl
@@ -46,6 +50,7 @@ lib/jed/lib/fortran.sl
 lib/jed/lib/generic.hlp
 lib/jed/lib/help.sl
 lib/jed/lib/html.sl
+lib/jed/lib/ide.sl
 lib/jed/lib/idl.sl
 lib/jed/lib/info.sl
 lib/jed/lib/isearch.sl
@@ -56,7 +61,6 @@ lib/jed/lib/ispell.sl
 lib/jed/lib/javamode.sl
 lib/jed/lib/jed.hlp
 lib/jed/lib/jed.rc
-lib/jed/lib/jed_funs.hlp
 lib/jed/lib/jedhelp.sl
 lib/jed/lib/keycode.sl
 lib/jed/lib/krconv.sl
@@ -64,12 +68,12 @@ lib/jed/lib/latex.sl
 lib/jed/lib/latex209.sl
 lib/jed/lib/linux.sl
 lib/jed/lib/lisp.sl
-lib/jed/lib/ltx-comp.dat
 lib/jed/lib/ltx-math.sl
 lib/jed/lib/macro.sl
 lib/jed/lib/mail.sl
 lib/jed/lib/mailalias.sl
 lib/jed/lib/man.sl
+lib/jed/lib/maple.sl
 lib/jed/lib/menu.sl
 lib/jed/lib/mime.sl
 lib/jed/lib/mini.sl
@@ -109,9 +113,12 @@ lib/jed/lib/spicemod.sl
 lib/jed/lib/srchmisc.sl
 lib/jed/lib/syntax.sl
 lib/jed/lib/tabs.sl
+lib/jed/lib/tclmode.sl
 lib/jed/lib/tex.sl
 lib/jed/lib/texcom.sl
 lib/jed/lib/textmac.sl
+lib/jed/lib/tm/linuxdoc.tm
+lib/jed/lib/tm2sgml.sl
 lib/jed/lib/tmisc.sl
 lib/jed/lib/tpascal.sl
 lib/jed/lib/untab.sl
@@ -122,10 +129,36 @@ lib/jed/lib/vms_shell.com
 lib/jed/lib/vmshelp.sl
 lib/jed/lib/wmark.sl
 lib/jed/lib/wmenu.sl
+lib/jed/lib/wordstar.hlp
 lib/jed/lib/wordstar.sl
 lib/jed/lib/yankpop.sl
-man/man1/jed.1
-man/man1/rgrep.1
-@dirrm lib/jed/bin
+@dirrm lib/jed/lib/tm
 @dirrm lib/jed/lib
 @dirrm lib/jed
+man/man1/jed.1
+man/man1/rgrep.1
+share/doc/jed/README
+share/doc/jed/abbrev.txt
+share/doc/jed/color.txt
+share/doc/jed/dfa.txt
+share/doc/jed/edt.txt
+share/doc/jed/emacs.txt
+share/doc/jed/fold.txt
+share/doc/jed/hooks.txt
+share/doc/jed/jed_faq.txt
+share/doc/jed/jedfuns.txt
+share/doc/jed/mouse.txt
+share/doc/jed/pc-keys.txt
+share/doc/jed/program.txt
+share/doc/jed/rgrep.txt
+share/doc/jed/rmail.txt
+share/doc/jed/script.txt
+share/doc/jed/slangfun.txt
+share/doc/jed/syntax.txt
+share/doc/jed/undo.txt
+share/doc/jed/wjed.txt
+share/doc/jed/wordstar.txt
+share/doc/jed/xjed.txt
+share/doc/jed/yankpop.txt
+@dirrm share/doc/jed
+