diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index ee6ddc83b3be6..9ddebb610ac34 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,3 +1,4 @@
 DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
 DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
+DIST ess-15.09-2.tgz 3248241 SHA256 706c41237e1edf33a369902f503bb25254b2bbb750b9ed1adee244e875264afb SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b WHIRLPOOL 3ad3cba11dc33f7b9c909017e6db2850fa078c736e4637e5bc15a8bbb23e2f66996186c31092caf3bb522d5e5d15543c9f4df6fe4f013ac8744695faf19bbd4f
 DIST ess-15.09.tgz 3239642 SHA256 3438683af3232280d9281938ad101a1e0bb92aa7c97f330c07d8ef7d10489465 SHA512 95350c1d558ba2bc8582978441569f40ba4c59609c21cd473908cc152c8cc6e4e38b9236cc47dd73469dcf14c8a359652e54de5632a21700835350764f401d4f WHIRLPOOL 426659087f7ace498cf99bcc67502c0d83c140ae8e5576d80747ba9fe22db641e2ef48dbbb0771231d880dddfc9fcf3ca8c482578e77c15c2d1b6a114509da46
diff --git a/app-emacs/ess/ess-15.09.2.ebuild b/app-emacs/ess/ess-15.09.2.ebuild
new file mode 100644
index 0000000000000..22b3cd709eeb6
--- /dev/null
+++ b/app-emacs/ess/ess-15.09.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-${PV%.*}-${PV##*.}"
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+	virtual/latex-base"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		INFODIR="${ED}/usr/share/info" \
+		LISPDIR="${ED}${SITELISP}/ess" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# Most documentation is installed by the package's build system.
+	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+	newdoc doc/ChangeLog ChangeLog-doc
+	newdoc lisp/ChangeLog ChangeLog-lisp
+
+	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+	readme.gentoo_create_doc
+}