diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 47dd3baca4fd..a5fb8683a5bb 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	editors java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}${PORTVERSION}install
 EXTRACT_SUFX=	.jar
-EXTRACT_ONLY=
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Powerful programmer\'s text editor written in Java
@@ -37,12 +36,22 @@ SUB_FILES=	jedit.sh
 DESKTOP_ENTRIES="jEdit" "${COMMENT}" "${PORTNAME}" \
 	"${PORTNAME}" "Development;" false
 
+post-extract:
+	@(cd ${WRKDIR}/installer ; ${TAR} -xjf jedit-api.tar.bz2 ;\
+		${TAR} -xjf jedit-macros.tar.bz2 ; \
+		${TAR} -xjf jedit-program.tar.bz2)
+
 do-install:
-	@${PRINTF} "${STAGEDIR}${DATADIR}\n${WRKDIR}\n${STAGEDIR}${PREFIX}/man/man1\nY\nY\nY" | \
-		${SETENV} CLASSPATH=${DISTDIR}/${DISTNAME}.jar \
-		${JAVA} installer.Install text
-	@${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${STAGEDIR}${PREFIX}/bin/jedit
-	@${INSTALL_DATA} ${STAGEDIR}${DATADIR}/doc/jedit.png \
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/installer/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
+.for dir in doc jars keymaps modes properties startup
+	(cd ${WRKDIR}/installer ; ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}/)
+.endfor
+	(cd ${WRKDIR}/installer ; ${TAR} --exclude 'modes' --exclude 'keymaps' \
+		-chf - macros | ${TAR}  -xf - -C ${STAGEDIR}${DATADIR}/)
+	${INSTALL_SCRIPT} ${WRKDIR}/jedit.sh ${STAGEDIR}${PREFIX}/bin/jedit
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/doc/jedit.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_MAN} ${WRKDIR}/jedit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>