diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 936aa940b958..73850a4b474f 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,34 +1,51 @@
 PORTNAME=	joe
 DISTVERSION=	4.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	editors
 MASTER_SITES=	SF/joe-editor/JOE%20sources/joe-${DISTVERSION}
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Joe's Own Editor
 WWW=		https://sourceforge.net/projects/joe-editor/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		desktop-file-utils gmake iconv ncurses
+FLAVORS=	tiny x11
+FLAVOR?=	${FLAVORS:[1]}
+
+USES=		gmake iconv ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SPELL=aspell
 
 ALL_TARGET=	${PORTNAME}
 
 CONFLICTS=	jupp
 
 OPTIONS_DEFINE=	ASPELL DOCS
 
 ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
 
+.if ${FLAVOR} == tiny
+CONFLICTS_INSTALL=	${PORTNAME}-x11
+EXTRA_PATCHES=		${PATCHDIR}/extra-patch-Makefile.in
+.else
+PKGNAMESUFFIX=		-x11
+USES+=			desktop-file-utils
+CONFLICTS_INSTALL=	${PORTNAME}
+PLIST_FILES=		share/applications/jmacs.desktop \
+			share/applications/joe.desktop \
+			share/applications/jpico.desktop \
+			share/applications/jstar.desktop
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|docs/README.old docs/man.md ||' ${WRKSRC}/Makefile.in
 
 post-install:
 .for rc in ftyperc jmacsrc joerc jpicorc jstarrc rjoerc
 	${MV} ${STAGEDIR}${ETCDIR}/${rc} ${STAGEDIR}${ETCDIR}/${rc}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/editors/joe/files/extra-patch-Makefile.in b/editors/joe/files/extra-patch-Makefile.in
new file mode 100644
index 000000000000..c2d8cc41f877
--- /dev/null
+++ b/editors/joe/files/extra-patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2026-05-16 11:52:38 UTC
++++ Makefile.in
+@@ -361,7 +361,7 @@ AUTOMAKE_OPTIONS = foreign
+ am__v_SED_0 = @echo "  SED     " $@;
+ am__v_SED_1 = 
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = man rc po syntax joe colors desktop
++SUBDIRS = man rc po syntax joe colors
+ EXTRA_DIST = COPYING docs/hacking.md ChangeLog NEWS.md docs/README.old README.md INSTALL.md INSTALL.AMIGA \
+ 	docs/help-system.html charmaps/klingon.in \
+ 	cygbuild setup.hint autojoe docs/man.md
diff --git a/editors/joe/pkg-plist b/editors/joe/pkg-plist
index 267b21a89e35..259888dfc475 100644
--- a/editors/joe/pkg-plist
+++ b/editors/joe/pkg-plist
@@ -1,124 +1,120 @@
 bin/jmacs
 bin/joe
 bin/jpico
 bin/jstar
 bin/rjoe
 @sample %%ETCDIR%%/ftyperc.sample
 %%ETCDIR%%/jicerc.ru
 @sample %%ETCDIR%%/jmacsrc.sample
 @sample %%ETCDIR%%/joerc.sample
 %%ETCDIR%%/joerc.zh_TW
 @sample %%ETCDIR%%/jpicorc.sample
 @sample %%ETCDIR%%/jstarrc.sample
 @sample %%ETCDIR%%/rjoerc.sample
 %%ETCDIR%%/shell.csh
 %%ETCDIR%%/shell.sh
 share/man/man1/joe.1.gz
 share/man/ru/man1/joe.1.gz
-share/applications/jmacs.desktop
-share/applications/joe.desktop
-share/applications/jpico.desktop
-share/applications/jstar.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/hacking.md
 %%DATADIR%%/charmaps/klingon
 %%DATADIR%%/colors/default.jcf
 %%DATADIR%%/colors/gruvbox.jcf
 %%DATADIR%%/colors/ir_black.jcf
 %%DATADIR%%/colors/molokai.jcf
 %%DATADIR%%/colors/solarized.jcf
 %%DATADIR%%/colors/wombat.jcf
 %%DATADIR%%/colors/xoria.jcf
 %%DATADIR%%/colors/zenburn-hc.jcf
 %%DATADIR%%/colors/zenburn.jcf
 %%DATADIR%%/lang/de.po
 %%DATADIR%%/lang/fr.po
 %%DATADIR%%/lang/ru.po
 %%DATADIR%%/lang/uk.po
 %%DATADIR%%/lang/zh_TW.po
 %%DATADIR%%/syntax/4gl.jsf
 %%DATADIR%%/syntax/ada.jsf
 %%DATADIR%%/syntax/ant.jsf
 %%DATADIR%%/syntax/asm.jsf
 %%DATADIR%%/syntax/avr.jsf
 %%DATADIR%%/syntax/awk.jsf
 %%DATADIR%%/syntax/batch.jsf
 %%DATADIR%%/syntax/c.jsf
 %%DATADIR%%/syntax/classic_pascal.jsf
 %%DATADIR%%/syntax/clojure.jsf
 %%DATADIR%%/syntax/cobol.jsf
 %%DATADIR%%/syntax/coffee.jsf
 %%DATADIR%%/syntax/comment_todo.jsf
 %%DATADIR%%/syntax/conf.jsf
 %%DATADIR%%/syntax/context.jsf
 %%DATADIR%%/syntax/csh.jsf
 %%DATADIR%%/syntax/csharp.jsf
 %%DATADIR%%/syntax/css.jsf
 %%DATADIR%%/syntax/d.jsf
 %%DATADIR%%/syntax/debian.jsf
 %%DATADIR%%/syntax/debian_changelog.jsf
 %%DATADIR%%/syntax/diff.jsf
 %%DATADIR%%/syntax/dockerfile.jsf
 %%DATADIR%%/syntax/elixir.jsf
 %%DATADIR%%/syntax/erb.jsf
 %%DATADIR%%/syntax/erlang.jsf
 %%DATADIR%%/syntax/filename.jsf
 %%DATADIR%%/syntax/fortran.jsf
 %%DATADIR%%/syntax/git-commit.jsf
 %%DATADIR%%/syntax/go.jsf
 %%DATADIR%%/syntax/groovy.jsf
 %%DATADIR%%/syntax/haml.jsf
 %%DATADIR%%/syntax/haskell.jsf
 %%DATADIR%%/syntax/html.jsf
 %%DATADIR%%/syntax/htmlerb.jsf
 %%DATADIR%%/syntax/ini.jsf
 %%DATADIR%%/syntax/iptables.jsf
 %%DATADIR%%/syntax/java.jsf
 %%DATADIR%%/syntax/jcf.jsf
 %%DATADIR%%/syntax/joerc.jsf
 %%DATADIR%%/syntax/js.jsf
 %%DATADIR%%/syntax/jsf.jsf
 %%DATADIR%%/syntax/jsf_check.jsf
 %%DATADIR%%/syntax/json.jsf
 %%DATADIR%%/syntax/lisp.jsf
 %%DATADIR%%/syntax/lua.jsf
 %%DATADIR%%/syntax/m4.jsf
 %%DATADIR%%/syntax/mail.jsf
 %%DATADIR%%/syntax/mason.jsf
 %%DATADIR%%/syntax/matlab.jsf
 %%DATADIR%%/syntax/md.jsf
 %%DATADIR%%/syntax/ocaml.jsf
 %%DATADIR%%/syntax/pascal.jsf
 %%DATADIR%%/syntax/perl.jsf
 %%DATADIR%%/syntax/php.jsf
 %%DATADIR%%/syntax/powershell.jsf
 %%DATADIR%%/syntax/prolog.jsf
 %%DATADIR%%/syntax/properties.jsf
 %%DATADIR%%/syntax/ps.jsf
 %%DATADIR%%/syntax/puppet.jsf
 %%DATADIR%%/syntax/python.jsf
 %%DATADIR%%/syntax/r.jsf
 %%DATADIR%%/syntax/rexx.jsf
 %%DATADIR%%/syntax/ruby.jsf
 %%DATADIR%%/syntax/rust.jsf
 %%DATADIR%%/syntax/scala.jsf
 %%DATADIR%%/syntax/sed.jsf
 %%DATADIR%%/syntax/sh.jsf
 %%DATADIR%%/syntax/sieve.jsf
 %%DATADIR%%/syntax/skill.jsf
 %%DATADIR%%/syntax/sml.jsf
 %%DATADIR%%/syntax/spec.jsf
 %%DATADIR%%/syntax/sql.jsf
 %%DATADIR%%/syntax/swift.jsf
 %%DATADIR%%/syntax/systemverilog.jsf
 %%DATADIR%%/syntax/tcl.jsf
 %%DATADIR%%/syntax/tex.jsf
 %%DATADIR%%/syntax/troff.jsf
 %%DATADIR%%/syntax/typescript.jsf
 %%DATADIR%%/syntax/verilog.jsf
 %%DATADIR%%/syntax/vhdl.jsf
 %%DATADIR%%/syntax/whitespace.jsf
 %%DATADIR%%/syntax/xml.jsf
 %%DATADIR%%/syntax/yaml.jsf