diff --git a/java/jde/Makefile b/java/jde/Makefile
index cadd174d01a8..d9c791284ed3 100644
--- a/java/jde/Makefile
+++ b/java/jde/Makefile
@@ -1,72 +1,73 @@
 # New ports collection makefile for:   jde
 # Date created:                8 January 2002
 # Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	jde
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	java elisp
 MASTER_SITES=	http://jdee.sunsite.dk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	dougk@dougk-ff7.net
 COMMENT=	Java Development Environment for Emacs
 
 USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
 .if ${EMACS_PORT_NAME} != "emacs21"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
 .endif
 
 BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet${PORTNAMESUFFIX} \
 		${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/avltree.el:${PORTSDIR}/devel/elib${PORTNAMESUFFIX}
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/lisp
 MAKEFILE=	makefile
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/jde
 JAVADIR=	${PREFIX}/share/java/jde
 
 post-patch:
 	@${REINPLACE_CMD} -e '/test -d/d' ${BUILD_WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|^CEDET = ../../cedet|CEDET = ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet|' \
 		${BUILD_WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|^ELIB  = ../../elib|ELIB  = ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/elib|' \
 		${BUILD_WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|^      dir|"${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/jde/"|' \
 		${BUILD_WRKSRC}/jde.el
 # ugh, broken permissions.
 	@${FIND} ${WRKSRC}/java -type f -exec ${CHMOD} 0644 {} \;
 	@${FIND} ${WRKSRC}/java -type d -exec ${CHMOD} 0755 {} \;
 
 do-install:
 	${MKDIR} ${LISPDIR}
 .for i in *.el *.elc *.bnf
 	${INSTALL_DATA} ${BUILD_WRKSRC}/${i} ${LISPDIR}
 .endfor
 	${MKDIR} ${JAVADIR}
 .for i in bsh-commands lib src
 	${CP} -R ${WRKSRC}/java/${i} ${JAVADIR}
 .endfor
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/jtags ${PREFIX}/bin
 
 post-install:
 	${LN} -sf ${JAVADIR} ${LISPDIR}/java
 	${LN} -sf ${JAVADIR} ${LISPDIR}/../java
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ReleaseNotes.txt ChangeLog
 	${CP} ${BUILD_WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in html tli_rbl
 	${CP} -R ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 	${LN} -sf ${DOCSDIR} ${LISPDIR}/doc
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jde/files/patch-jde-version-check-fix b/java/jde/files/patch-jde-version-check-fix
new file mode 100644
index 000000000000..9bb5baee5af0
--- /dev/null
+++ b/java/jde/files/patch-jde-version-check-fix
@@ -0,0 +1,48 @@
+diff -ru ../old/jde-2.3.5/lisp/jde-util.el ./lisp/jde-util.el
+--- ../old/jde-2.3.5/lisp/jde-util.el	Fri Dec 17 04:29:37 2004
++++ ./lisp/jde-util.el	Tue Apr 11 03:27:47 2006
+@@ -90,6 +90,13 @@
+ 	      (aset newstr i tochar)))
+ 	newstr)))
+ 
++(if (not (fboundp 'replace-in-string))
++    (defun replace-in-string  (string regexp newtext &optional literal)
++      "Replace REGEXP with NEWTEXT in STRIng."
++      (if (string-match regexp string)
++	  (replace-match newtext nil nil string)
++	string)))
++
+ (defun jde-get-line-at-point (&optional pos)
+   "Get the number of the line at point."
+   (let* ((point (or pos (point)))
+diff -ru ../old/jde-2.3.5/lisp/jde.el ./lisp/jde.el
+--- ../old/jde-2.3.5/lisp/jde.el	Fri Dec 17 04:29:35 2004
++++ ./lisp/jde.el	Tue Apr 11 03:27:04 2006
+@@ -998,17 +998,16 @@
+ 
+ (defun jde-earlier-versionp (ver1 ver2) 
+   "Return non-nil if VER1 is earlier than VER2"
+-  (let ((ver1-betap (string-match "beta" ver1))
+-        (ver2-betap (string-match "beta" ver2)))
+-    (if (or (and ver1-betap ver2-betap)
+-            (and (not ver1-betap) (not ver2-betap)))
+-        (string< ver1 ver2)
+-      (if ver1-betap
+-          (progn
+-            (or (string= ver2 (substring ver1  0 ver1-betap))
+-                (string< (substring ver1 0 ver1-betap) ver2)))
+-          (progn
+-            (string< ver1 (substring ver2 0 ver2-betap)))))))
++  (let ((ver1n (replace-in-string ver1 "beta" "zb"))
++	(ver2n (replace-in-string ver2 "beta" "zb")))
++    (setq ver1n (replace-in-string ver1n "pre" "zp"))
++    (setq ver2n (replace-in-string ver2n "pre" "zp"))
++    (if (string-match "z" ver1n)
++	(unless (string-match "z" ver2n)
++	  (setq ver2n (concat ver2n "zz")))
++      (if (string-match "z" ver2n)
++	  (setq ver1n (concat ver1n "zz"))))
++    (string< ver1n ver2n)))
+       
+ (defcustom jde-log-max 500
+   "*Maximum number of lines to keep in the JDE log buffer.