diff --git a/erlang.spec b/erlang.spec
index 664d7a6..b8451bf 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -25,7 +25,6 @@
 ##
 
 %global __with_emacs 1
-%global __with_xemacs 0
 %global __with_examples 1
 %global __with_java 1
 #
@@ -661,10 +660,6 @@ Summary: A set of programming tools including a coverage analyzer etc
 BuildRequires: emacs
 BuildRequires: emacs-el
 %endif %{__with_emacs}
-%if %{__with_xemacs}
-BuildRequires: xemacs
-BuildRequires: xemacs-packages-extra-el
-%endif %{__with_xemacs}
 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
 Requires: %{name}-erts%{?_isa} = %{version}-%{release}
 Requires: %{name}-inets%{?_isa} = %{version}-%{release}
@@ -676,11 +671,6 @@ Requires: emacs-filesystem
 Obsoletes: emacs-erlang
 Obsoletes: emacs-erlang-el
 %endif %{__with_emacs}
-%if %{__with_xemacs}
-Requires: xemacs-filesystem
-Obsoletes: xemacs-erlang
-Obsoletes: xemacs-erlang-el
-%endif %{__with_xemacs}
 
 
 %description tools
@@ -777,21 +767,6 @@ pushd emacs-erlang
 %{_emacs_bytecompile} *.el
 popd
 %endif %{__with_emacs}
-%if %{__with_xemacs}
-# XEmacs related stuff
-cat > xemacs-erlang-init.el << EOF
-(setq load-path (cons "%{_xemacs_sitelispdir}/erlang" load-path))
-(setq erlang-root-dir "%{_libdir}/erlang")
-(setq exec-path (cons "%{_libdir}/erlang/bin" exec-path))
-(require 'erlang-start)
-EOF
-mkdir xemacs-erlang
-cp lib/tools/emacs/*.el xemacs-erlang/
-rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el xemacs-erlang/erldoc.el xemacs-erlang/erlang-edoc.el
-pushd xemacs-erlang
-%{_xemacs_bytecompile} *.el
-popd
-%endif %{__with_xemacs}
 
 make
 
@@ -822,19 +797,6 @@ for f in lib/tools/emacs/{README,*.el}; do
 done
 install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/"
 %endif %{__with_emacs}
-%if %{__with_xemacs}
-# XEmacs related stuff
-install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}"
-install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang"
-install -m 0644 xemacs-erlang-init.el "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}/erlang-init.el"
-for f in lib/tools/emacs/{README,*.el}; do
-	b="$(basename "$f")";
-	ln -s "%{_libdir}/erlang/lib/tools-${erlang_tools_vsn}/emacs/$b" \
-		"$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/"
-done
-rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el"
-install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/"
-%endif %{__with_xemacs}
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -1692,13 +1654,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
 %{_emacs_sitelispdir}/erlang/*.elc
 %{_emacs_sitestartdir}/erlang-init.el
 %endif %{__with_emacs}
-%if %{__with_xemacs}
-%dir %{_xemacs_sitelispdir}/erlang
-%doc %{_xemacs_sitelispdir}/erlang/README
-%{_xemacs_sitelispdir}/erlang/*.el
-%{_xemacs_sitelispdir}/erlang/*.elc
-%{_xemacs_sitestartdir}/erlang-init.el
-%endif %{__with_xemacs}
 
 %if %{__with_wxwidgets}
 %files wx
@@ -1959,6 +1914,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
 %changelog
 * Fri Jan 15 2021 Peter Lemenkov <lemenkov@gmail.com> - 23.2.2-1
 - Ver. 23.2.2
+- Disable XEmacs support (dead upstream, scheduled for removal from Fedora)
 
 * Tue Dec 22 2020 Peter Lemenkov <lemenkov@gmail.com> - 23.2.1-1
 - Ver. 23.2.1
diff --git a/otp-make-subpackages.py b/otp-make-subpackages.py
index e004bf3..fd9df5e 100644
--- a/otp-make-subpackages.py
+++ b/otp-make-subpackages.py
@@ -24,9 +24,7 @@ package_headers = {}
 package_noarch = [
 		"emacs-erlang",
 		"emacs-erlang-el",
-		"erlang-doc",
-		"xemacs-erlang",
-		"xemacs-erlang-el"]
+		"erlang-doc"]
 
 # These are additional Requires which cannot be picked up automatically (yet).
 # TODO these should be added automatically
@@ -44,8 +42,6 @@ package_additional_requires = {
 		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
 		"erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils"],
 		"erlang-wx": ["mesa-libGL", "mesa-libGLU"],
-		"xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"],
-		"xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"]
 		}
 
 package_additional_buildrequires = {
@@ -70,8 +66,6 @@ package_additional_buildrequires = {
 		"erlang-jinterface": ["java-devel"],
 
 		"erlang-odbc": ["unixODBC-devel"],
-		"erlang-wx": ["wxGTK-devel"],
-		"xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"],
 		}
 
 package_additional_obsoletes = {