diff --git a/srcpkgs/emacs-ess/patches/emacs-28.patch b/srcpkgs/emacs-ess/patches/emacs-28.patch
new file mode 100644
index 00000000000..f7b61391c37
--- /dev/null
+++ b/srcpkgs/emacs-ess/patches/emacs-28.patch
@@ -0,0 +1,23 @@
+From 9cc5520e1998d03f5dec0fbb1fe71b7cdec38b65 Mon Sep 17 00:00:00 2001
+From: Alex Branham <alex.branham@gmail.com>
+Date: Wed, 6 Jan 2021 06:41:20 -0500
+Subject: [PATCH] Add required when to obsolete function alias
+
+Closes #1085
+---
+ lisp/ess-r-package.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lisp/ess-r-package.el b/lisp/ess-r-package.el
+index 260959955..397ce14e6 100644
+--- a/lisp/ess-r-package.el
++++ b/lisp/ess-r-package.el
+@@ -577,7 +577,7 @@ package mode. Use this function if state of the buffer such as
+   (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
+ 
+ (defalias 'ess-toggle-developer 'ess-developer)
+-(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
++(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "18.04")
+ (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
+ 
+ (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")
diff --git a/srcpkgs/emacs-ess/template b/srcpkgs/emacs-ess/template
index 272c465f891..74000d7c4e0 100644
--- a/srcpkgs/emacs-ess/template
+++ b/srcpkgs/emacs-ess/template
@@ -2,9 +2,7 @@
 pkgname=emacs-ess
 reverts="18.10r1_1"
 version=18.10.2
-revision=4
-create_wrksrc=yes
-build_wrksrc="ess-${version}"
+revision=5
 makedepends="emacs perl"
 depends="emacs R"
 short_desc="Emacs Speaks Statistics: A Universal Interface for Statistical Analysis"
@@ -12,13 +10,19 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ess.r-project.org"
 _juliarev=ec01995f60486480cf2240bbd3b9a2ff3fa9e0f0
-_juliafile=julia-mode-${_juliarev}.el.txt
 distfiles="https://ess.r-project.org/downloads/ess/ess-${version}.tgz
- https://raw.githubusercontent.com/JuliaEditorSupport/julia-emacs/${_juliarev}/julia-mode.el>${_juliafile}"
+ https://raw.githubusercontent.com/JuliaEditorSupport/julia-emacs/${_juliarev}/julia-mode.el"
 checksum="f77b42283c698da091aabca9ccd14a648c3240f00898b93128490feefa04e9d6
  132915c0f04c3ab755e78d7bbc89d58f033a67e1a56e685f14dfeb8078cd69b3"
 nocross="emacs is nocross"
 
+skip_extraction="julia-mode.el"
+
+post_extract() {
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/julia-mode.el \
+		lisp/julia-mode.el
+}
+
 pre_configure() {
 	sed -e '/^ELS = \$(wildcard \*\.el)$/s@$@ $(wildcard obsolete/*.el)@' -i lisp/Makefile
 	sed -e '/^	cd doc; \$(MAKE) \$@/d' -i Makefile
@@ -26,7 +30,6 @@ pre_configure() {
 }
 
 do_build() {
-	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_juliafile} lisp/julia-mode.el
 	make prefix=/usr
 }