diff --git a/app-emacs/bnf-mode/Manifest b/app-emacs/bnf-mode/Manifest
new file mode 100644
index 0000000000000..9f6c1ef69a221
--- /dev/null
+++ b/app-emacs/bnf-mode/Manifest
@@ -0,0 +1 @@
+DIST bnf-mode-0.4.5_pre20220102.tar.gz 27103 BLAKE2B 816637a440cfbe009873ea1c5033532a24ef1b8e842415665458b18d3ba7e9f37a1521e67e43c6287a598c8eb671b514563b1d255031ad255ec51ad5995579cd SHA512 d3d7215efb19c313aba1a99100616b1ee7345d41933921d5150c6d72c7afc5f4b86e085a07bddce78aac7400cf605d8d0ba1c24232df79ad01fef5744567778f
diff --git a/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
new file mode 100644
index 0000000000000..8c438602742dd
--- /dev/null
+++ b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=d9329dd90e5d4f629295e85898362d9682047898
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing BNF grammars"
+HOMEPAGE="https://github.com/sergeyklay/bnf-mode/"
+SRC_URI="https://github.com/sergeyklay/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/buttercup
+		app-emacs/undercover
+	)
+"
+
+DOCS=( NEWS README.org )
+ELISP_REMOVE=".dir-locals.el"
+ELISP_TEXINFO="bnf-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
new file mode 100644
index 0000000000000..2679585378f29
--- /dev/null
+++ b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bnf-mode "bnf-mode"
+  "A major mode for editing BNF grammars." t)
+(add-to-list 'auto-mode-alist '("\\.bnf\\'" . bnf-mode))
diff --git a/app-emacs/bnf-mode/metadata.xml b/app-emacs/bnf-mode/metadata.xml
new file mode 100644
index 0000000000000..5dc13c7cc06e7
--- /dev/null
+++ b/app-emacs/bnf-mode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/sergeyklay/bnf-mode/issues/</bugs-to>
+    <remote-id type="github">sergeyklay/bnf-mode</remote-id>
+  </upstream>
+</pkgmetadata>