diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index ac35e1f76852..253749399c87 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1 +1,2 @@
 DIST calfw-1.6.tar.gz 74776 BLAKE2B 26aee13fa7533c17eac9c32e8355c6e2fd760e8f87166d7a28ae90040a156ad8e8d8205387b37e5069705fa42095f318a40032ba5ce161f3d84f4823ee6619be SHA512 0c51c1747cfdda003a3b2244224e1bc2afe7b3dbdbb47804734504013ad94f7c5aaa30a2370ae9383f3836f266d47f695ca3d90419d899c8a639d474fab14180
+DIST calfw-2.0.tar.gz 86349 BLAKE2B 60c5db2eac96741d04199552106630f1c8ea96e32920275ff6ade6973e55ec326d185c4e0eb70f69bb1c00be4a5051d4f5e8df7653a899e1a939e6f8389485a4 SHA512 4d37114eaf3fe3e5f394cf9def6e43ea4603a9252453399375a8e8b34fc4478d0887f68c48f16266c59a617418379bfe530bc4748ec1f8b8f1bfaa5056673f92
diff --git a/app-emacs/calfw/calfw-2.0.ebuild b/app-emacs/calfw/calfw-2.0.ebuild
new file mode 100644
index 000000000000..041b8088b9a7
--- /dev/null
+++ b/app-emacs/calfw/calfw-2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A calendar framework for Emacs"
+HOMEPAGE="https://github.com/kiwanami/emacs-calfw/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kiwanami/emacs-${PN}"
+else
+	SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="howm"
+
+RDEPEND="
+	howm? ( app-emacs/howm )
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( CHANGELOG.md readme.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	if ! use howm ; then
+		rm calfw-howm.el || die
+	fi
+}