diff --git a/editors/joe/patches/patch-ab b/editors/joe/patches/patch-ab
index a3aaab6f0e8..7aa8e082cc1 100644
--- a/editors/joe/patches/patch-ab
+++ b/editors/joe/patches/patch-ab
@@ -1,5 +1,5 @@
-*** Makefile.orig	Thu Apr 16 17:56:49 1998
---- Makefile	Thu Apr 16 17:57:27 1998
+*** Makefile.orig	Mon Jan 23 12:01:28 1995
+--- Makefile	Mon Sep 28 16:37:20 1998
 ***************
 *** 10,17 ****
   # to go:
@@ -19,3 +19,30 @@
   
   # If you want to use TERMINFO, you have to set
   # the following variable to 1.  Also you have to
+***************
+*** 115,126 ****
+  	chmod a+r $(WHERERC)/jpicorc
+  	chmod a+r $(WHEREMAN)/joe.1
+  	chmod a+x $(WHEREJOE)/termidx
+! 	rm -f $(WHERERC)/termcap
+! 	cp termcap $(WHERERC)/termcap
+! 	chmod a+r $(WHERERC)/termcap
+! 	rm -f $(WHERERC)/terminfo
+! 	cp terminfo $(WHERERC)/terminfo
+! 	chmod a+r $(WHERERC)/terminfo
+  
+  # Cleanup proceedure
+  
+--- 115,126 ----
+  	chmod a+r $(WHERERC)/jpicorc
+  	chmod a+r $(WHEREMAN)/joe.1
+  	chmod a+x $(WHEREJOE)/termidx
+! #	rm -f $(WHERERC)/termcap
+! #	cp termcap $(WHERERC)/termcap
+! #	chmod a+r $(WHERERC)/termcap
+! #	rm -f $(WHERERC)/terminfo
+! #	cp terminfo $(WHERERC)/terminfo
+! #	chmod a+r $(WHERERC)/terminfo
+  
+  # Cleanup proceedure
+  
diff --git a/editors/joe/patches/patch-af b/editors/joe/patches/patch-af
index a3ae360c3e6..ccfc9d5f0e2 100644
--- a/editors/joe/patches/patch-af
+++ b/editors/joe/patches/patch-af
@@ -1,54 +1,20 @@
-*** termcap.c.orig	Thu Apr 16 18:04:11 1998
---- termcap.c	Thu Apr 16 18:05:15 1998
+*** termcap.c.orig	Mon Sep 28 16:33:10 1998
+--- termcap.c	Mon Sep 28 16:33:31 1998
 ***************
-*** 153,159 ****
-  char *tp, *pp, *qq, *namebuf, **npbuf, *idxname;
-  int sortsiz;
-  
-! if(!name && !(name=joeterm) && !(name=getenv("TERM"))) return 0;
-  cap=(CAP *)malloc(sizeof(CAP));
-  cap->tbuf=vsmk(4096);
-  cap->abuf=0;
---- 153,159 ----
-  char *tp, *pp, *qq, *namebuf, **npbuf, *idxname;
-  int sortsiz;
-  
-! if(!name && !(name=joeterm) && !(name=(char *)getenv("TERM"))) return 0;
-  cap=(CAP *)malloc(sizeof(CAP));
-  cap->tbuf=vsmk(4096);
-  cap->abuf=0;
-***************
-*** 175,190 ****
-  cap->sort=(struct sortentry *)malloc(sizeof(struct sortentry)*(sortsiz=64));
-  cap->sortlen=0;
-  
-! tp=getenv("TERMCAP");
-  
-  if(tp && tp[0]=='/') namebuf=vsncpy(NULL,0,sz(tp));
-  else
-   {
-   if(tp) cap->tbuf=vsncpy(sv(cap->tbuf),sz(tp));
-!  if((tp=getenv("TERMPATH"))) namebuf=vsncpy(NULL,0,sz(tp));
-   else
-    {
-!   if((tp=getenv("HOME")))
-     namebuf=vsncpy(NULL,0,sz(tp)),
-     namebuf=vsadd(namebuf,'/');
-    else
---- 175,190 ----
-  cap->sort=(struct sortentry *)malloc(sizeof(struct sortentry)*(sortsiz=64));
-  cap->sortlen=0;
-  
-! tp=(char *)getenv("TERMCAP");
-  
-  if(tp && tp[0]=='/') namebuf=vsncpy(NULL,0,sz(tp));
-  else
-   {
-   if(tp) cap->tbuf=vsncpy(sv(cap->tbuf),sz(tp));
-!  if((tp=(char *)getenv("TERMPATH"))) namebuf=vsncpy(NULL,0,sz(tp));
-   else
-    {
-!   if((tp=(char *)getenv("HOME")))
-     namebuf=vsncpy(NULL,0,sz(tp)),
-     namebuf=vsadd(namebuf,'/');
-    else
+*** 275,281 ****
+   *pp++=0;
+   loop1:
+   if(pp[0]==' ' || pp[0]=='\t') goto loop;
+!  for(q=0;pp[q] && pp[q]!='#' && pp[q]!='=' && pp[q]!='@' && pp[q]!=':';++q);
+   qq=pp;
+   c=pp[q]; pp[q]=0;
+   if(c) pp+=q+1;
+--- 275,282 ----
+   *pp++=0;
+   loop1:
+   if(pp[0]==' ' || pp[0]=='\t') goto loop;
+!  q=0; if (pp[q]=='@') q++;
+!  for(;pp[q] && pp[q]!='#' && pp[q]!='=' && pp[q]!='@' && pp[q]!=':';++q);
+   qq=pp;
+   c=pp[q]; pp[q]=0;
+   if(c) pp+=q+1;
diff --git a/editors/joe/patches/patch-ah b/editors/joe/patches/patch-ah
new file mode 100644
index 00000000000..993780454c7
--- /dev/null
+++ b/editors/joe/patches/patch-ah
@@ -0,0 +1,39 @@
+*** joerc.orig	Mon Sep 28 16:35:30 1998
+--- joerc	Mon Sep 28 16:36:16 1998
+***************
+*** 277,283 ****
+  	.kl		Left
+  	.kr		Right
+  	.kh		Home
+! 	.kH		End
+  	.kI		Insert
+  	.kD		Delete
+  	.kP		PgUp
+--- 277,283 ----
+  	.kl		Left
+  	.kr		Right
+  	.kh		Home
+! 	.kH or .@7	End
+  	.kI		Insert
+  	.kD		Delete
+  	.kP		PgUp
+***************
+*** 477,482 ****
+--- 477,483 ----
+  eof		^K ^V
+  eof		^K v
+  eol		.kH		Go to end of line
++ eol		.@7
+  eol		^E
+  exsave		^K X		Save and exit
+  exsave		^K ^X
+***************
+*** 570,575 ****
+--- 571,577 ----
+  eofmenu		^K ^V
+  eofmenu		^K v
+  eolmenu		.kH
++ eolmenu		.@7
+  eolmenu		^E
+  ltarwmenu	.kl
+  ltarwmenu	^B
diff --git a/editors/joe/pkg/PLIST b/editors/joe/pkg/PLIST
index ef34cc1eaeb..bb28ed3a4a4 100644
--- a/editors/joe/pkg/PLIST
+++ b/editors/joe/pkg/PLIST
@@ -13,7 +13,5 @@ lib/joe/jmacsrc
 lib/joe/jstarrc
 lib/joe/rjoerc
 lib/joe/jpicorc
-lib/joe/termcap
-lib/joe/terminfo
 man/man1/joe.1
 @dirrm lib/joe