diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 23e979121f70..59da314df948 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	joe
-PORTVERSION=	3.0
+PORTVERSION=	3.1
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/editors/joe-devel/distinfo b/editors/joe-devel/distinfo
index af87ea11b2d7..7c4b02feebb8 100644
--- a/editors/joe-devel/distinfo
+++ b/editors/joe-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (joe-3.0.tar.gz) = 05395f2f8566351d660c48390cf31dc6
-SIZE (joe-3.0.tar.gz) = 310584
+MD5 (joe-3.1.tar.gz) = 2a6ef018870fca9b7df85401994fb0e0
+SIZE (joe-3.1.tar.gz) = 381201
diff --git a/editors/joe-devel/files/patch-types.h b/editors/joe-devel/files/patch-types.h
deleted file mode 100644
index 5003b5424fd4..000000000000
--- a/editors/joe-devel/files/patch-types.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- types.h.orig	Sun Dec 23 19:26:52 2001
-+++ types.h	Sun Dec 23 19:27:07 2001
-@@ -163,6 +163,7 @@
- 	int	rdonly;		/* Set for read-only */
- 	int	internal;	/* Set for internal buffers */
- 	int	er;		/* Error code when file was loaded */
-+	int	filehandle;	/* File handle for locking */
- };
- 
- 
diff --git a/editors/joe-devel/pkg-plist b/editors/joe-devel/pkg-plist
index e9455e9c4249..9daa661d8ca1 100644
--- a/editors/joe-devel/pkg-plist
+++ b/editors/joe-devel/pkg-plist
@@ -4,6 +4,7 @@ bin/jpico
 bin/jstar
 bin/rjoe
 bin/termidx
+etc/joe/charmaps/klingon
 @unexec if cmp -s %D/etc/joe/jmacsrc.dist %D/etc/joe/jmacsrc; then rm -f %D/etc/joe/jmacsrc; fi
 etc/joe/jmacsrc.dist
 @exec if [ ! -f %D/etc/joe/jmacsrc ]; then cp %D/etc/joe/%f %D/etc/joe/jmacsrc; fi
@@ -19,16 +20,30 @@ etc/joe/jstarrc.dist
 @unexec if cmp -s %D/etc/joe/rjoerc.dist %D/etc/joe/rjoerc; then rm -f %D/etc/joe/rjoerc; fi
 etc/joe/rjoerc.dist
 @exec if [ ! -f %D/etc/joe/rjoerc ]; then cp %D/etc/joe/%f %D/etc/joe/rjoerc; fi
+etc/joe/syntax/asm.jsf
 etc/joe/syntax/c.jsf
 etc/joe/syntax/conf.jsf
+etc/joe/syntax/csh.jsf
+etc/joe/syntax/diff.jsf
+etc/joe/syntax/fortran.jsf
+etc/joe/syntax/html.jsf
+etc/joe/syntax/java.jsf
+etc/joe/syntax/lisp.jsf
+etc/joe/syntax/mail.jsf
+etc/joe/syntax/mason.jsf
+etc/joe/syntax/pascal.jsf
 etc/joe/syntax/perl.jsf
 etc/joe/syntax/php.jsf
 etc/joe/syntax/python.jsf
 etc/joe/syntax/sh.jsf
+etc/joe/syntax/tcl.jsf
 etc/joe/syntax/verilog.jsf
+etc/joe/syntax/vhdl.jsf
+etc/joe/syntax/xml.jsf
 %%PORTDOCS%%%%DOCSDIR%%/CommandList
 %%PORTDOCS%%%%DOCSDIR%%/INFO
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/joe/charmaps
 @dirrm etc/joe/syntax
 @dirrm etc/joe