Index: head/editors/joe/Makefile
===================================================================
--- head/editors/joe/Makefile
+++ head/editors/joe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	joe
 PORTVERSION=	4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	editors
 MASTER_SITES=	SF/joe-editor/JOE%20sources/joe-${PORTVERSION}
@@ -12,10 +13,8 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	aspell:textproc/aspell
-RUN_DEPENDS=	aspell:textproc/aspell
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	ASPELL DOCS
 
 CONFLICTS=	joe-2.*
 
@@ -26,6 +25,12 @@
 
 ALL_TARGET=	${PORTNAME}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MASPELL}
+RUN_DEPENDS=	aspell:textproc/aspell
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|docs/README.old docs/man.md ||' ${WRKSRC}/Makefile.in
 
Index: head/editors/joe/files/patch-configure
===================================================================
--- head/editors/joe/files/patch-configure
+++ head/editors/joe/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2016-03-06 19:35:47.000000000 +0000
++++ configure	2016-06-05 13:46:54.833041496 +0000
+@@ -8145,7 +8145,7 @@
+   done
+ IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_SPELL" && ac_cv_prog_SPELL="ispell"
++  test -z "$ac_cv_prog_SPELL" && ac_cv_prog_SPELL="aspell"
+ fi
+ fi
+ SPELL=$ac_cv_prog_SPELL