diff --git a/net-mail/notmuch/notmuch-0.28.4.ebuild b/net-mail/notmuch/notmuch-0.28.4.ebuild
index 2856cf698a2c8..c43123227e0c3 100644
--- a/net-mail/notmuch/notmuch-0.28.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.4.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -104,9 +105,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {
diff --git a/net-mail/notmuch/notmuch-0.29.2.ebuild b/net-mail/notmuch/notmuch-0.29.2.ebuild
index f848c35df5ec2..4ee535926dd5e 100644
--- a/net-mail/notmuch/notmuch-0.29.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.2.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {
diff --git a/net-mail/notmuch/notmuch-0.29.3.ebuild b/net-mail/notmuch/notmuch-0.29.3.ebuild
index f848c35df5ec2..4ee535926dd5e 100644
--- a/net-mail/notmuch/notmuch-0.29.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.3.ebuild
@@ -38,7 +38,7 @@ CDEPEND="
 	>=sys-libs/zlib-1.2.5.2
 	sys-libs/talloc
 	crypt? ( dev-libs/gmime:3.0[crypt] )
-	emacs? ( >=app-editors/emacs-23.1:* )
+	emacs? ( >=app-editors/emacs-24.1:* )
 	python? ( ${PYTHON_DEPS} )
 	"
 DEPEND="${CDEPEND}
@@ -49,7 +49,7 @@ DEPEND="${CDEPEND}
 	)
 	test? (
 		app-misc/dtach
-		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		>=app-editors/emacs-24.1:*[libxml2]
 		sys-devel/gdb
 		crypt? ( app-crypt/gnupg dev-libs/openssl )
 	)
@@ -72,6 +72,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+NEED_EMACS="24.1"
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 PATCHES=(
@@ -103,9 +104,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
+	use emacs && elisp-check-emacs-version
 }
 
 src_unpack() {