diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index 65f0f050bbfa..0012beabdfd6 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -1,45 +1,29 @@
 PORTNAME=	clojure-cider
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20.0
+DISTVERSION=	1.21.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Clojure IDE and REPL for Emacs
 WWW=		https://github.com/clojure-emacs/cider
 
 LICENSE=	GPLv3+
 
 RUN_DEPENDS=	clojure-mode.el${EMACS_PKGNAMESUFFIX}>0:lang/clojure-mode.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash.el@${EMACS_FLAVOR} \
 		epl.el${EMACS_PKGNAMESUFFIX}>0:devel/epl.el@${EMACS_FLAVOR} \
 		pkg-info.el${EMACS_PKGNAMESUFFIX}>0:devel/pkg-info.el@${EMACS_FLAVOR}
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	clojure-emacs
 GH_PROJECT=	cider
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	${EMACS_SITE_LISPDIR}/cider-client.el \
-		${EMACS_SITE_LISPDIR}/cider-eldoc.el \
-		${EMACS_SITE_LISPDIR}/cider-inspector.el \
-		${EMACS_SITE_LISPDIR}/cider-macroexpansion.el \
-		${EMACS_SITE_LISPDIR}/cider-mode.el \
-		${EMACS_SITE_LISPDIR}/cider-repl.el \
-		${EMACS_SITE_LISPDIR}/cider-scratch.el \
-		${EMACS_SITE_LISPDIR}/cider-selector.el \
-		${EMACS_SITE_LISPDIR}/cider-stacktrace.el \
-		${EMACS_SITE_LISPDIR}/cider-util.el \
-		${EMACS_SITE_LISPDIR}/cider.el \
-		${EMACS_SITE_LISPDIR}/nrepl-client.el
-
 do-install:
-.for f in ${PLIST_FILES:S,^${EMACS_SITE_LISPDIR}/,,}
-	${INSTALL_DATA} ${WRKSRC}/${f} \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/clojure-cider/distinfo b/devel/clojure-cider/distinfo
index 35505b694dcf..a7f3a6949532 100644
--- a/devel/clojure-cider/distinfo
+++ b/devel/clojure-cider/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762529599
-SHA256 (clojure-emacs-cider-v1.20.0_GH0.tar.gz) = 2a1410a17567f50f1a42e35d64e15f0f9035b2a860d8e6ea3c97a5caff9f7449
-SIZE (clojure-emacs-cider-v1.20.0_GH0.tar.gz) = 8837651
+TIMESTAMP = 1770568353
+SHA256 (clojure-emacs-cider-v1.21.0_GH0.tar.gz) = bef5165c805639b0766069c2b730ff1420d544c8cb9d1d8404f0cace463e1110
+SIZE (clojure-emacs-cider-v1.21.0_GH0.tar.gz) = 8833612
diff --git a/devel/clojure-cider/pkg-plist b/devel/clojure-cider/pkg-plist
new file mode 100644
index 000000000000..610bb16a33dc
--- /dev/null
+++ b/devel/clojure-cider/pkg-plist
@@ -0,0 +1,41 @@
+%%EMACS_SITE_LISPDIR%%/cider-apropos.el
+%%EMACS_SITE_LISPDIR%%/cider-browse-ns.el
+%%EMACS_SITE_LISPDIR%%/cider-browse-spec.el
+%%EMACS_SITE_LISPDIR%%/cider-cheatsheet.el
+%%EMACS_SITE_LISPDIR%%/cider-classpath.el
+%%EMACS_SITE_LISPDIR%%/cider-client.el
+%%EMACS_SITE_LISPDIR%%/cider-clojuredocs.el
+%%EMACS_SITE_LISPDIR%%/cider-common.el
+%%EMACS_SITE_LISPDIR%%/cider-completion-context.el
+%%EMACS_SITE_LISPDIR%%/cider-completion.el
+%%EMACS_SITE_LISPDIR%%/cider-connection.el
+%%EMACS_SITE_LISPDIR%%/cider-debug.el
+%%EMACS_SITE_LISPDIR%%/cider-doc.el
+%%EMACS_SITE_LISPDIR%%/cider-docstring.el
+%%EMACS_SITE_LISPDIR%%/cider-eldoc.el
+%%EMACS_SITE_LISPDIR%%/cider-eval.el
+%%EMACS_SITE_LISPDIR%%/cider-find.el
+%%EMACS_SITE_LISPDIR%%/cider-format.el
+%%EMACS_SITE_LISPDIR%%/cider-inspector.el
+%%EMACS_SITE_LISPDIR%%/cider-jar.el
+%%EMACS_SITE_LISPDIR%%/cider-log.el
+%%EMACS_SITE_LISPDIR%%/cider-macroexpansion.el
+%%EMACS_SITE_LISPDIR%%/cider-mode.el
+%%EMACS_SITE_LISPDIR%%/cider-ns.el
+%%EMACS_SITE_LISPDIR%%/cider-overlays.el
+%%EMACS_SITE_LISPDIR%%/cider-popup.el
+%%EMACS_SITE_LISPDIR%%/cider-profile.el
+%%EMACS_SITE_LISPDIR%%/cider-repl-history.el
+%%EMACS_SITE_LISPDIR%%/cider-repl.el
+%%EMACS_SITE_LISPDIR%%/cider-resolve.el
+%%EMACS_SITE_LISPDIR%%/cider-scratch.el
+%%EMACS_SITE_LISPDIR%%/cider-selector.el
+%%EMACS_SITE_LISPDIR%%/cider-stacktrace.el
+%%EMACS_SITE_LISPDIR%%/cider-test.el
+%%EMACS_SITE_LISPDIR%%/cider-tracing.el
+%%EMACS_SITE_LISPDIR%%/cider-util.el
+%%EMACS_SITE_LISPDIR%%/cider-xref-backend.el
+%%EMACS_SITE_LISPDIR%%/cider-xref.el
+%%EMACS_SITE_LISPDIR%%/cider.el
+%%EMACS_SITE_LISPDIR%%/nrepl-client.el
+%%EMACS_SITE_LISPDIR%%/nrepl-dict.el