diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 9a8ee2e6261b8..3bac698d90b78 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1 +1,2 @@
 DIST when-1.1.33.tar.gz 49740 SHA256 568a49e999363a018186e03c38d116c587b332f7fcf60820f9cfc34779050ab0 SHA512 5c0934257133f75a7de984499f99f68dde5343d51051acf1b454f04dae82254c733e946a6c5ead546dc3c07cd113d938a48c95af39b80cbfc04ee6d748223c83 WHIRLPOOL 9bcbe73a4034b817fc34d302689a0b404563081163c692ee23e484fbb9ab993a90a5d468f2586e7f5327abad98f4033ebd7546255f682898e899a9fdd7629c97
+DIST when-1.1.35.tar.gz 51308 SHA256 f880c0d80b1023a05df99690e36be133c46071657b9921fc9e8d16115fb13ae6 SHA512 b9acd1e3ea69c3ea9672eb16bd291c79612bbd037b4b96f6350d44da1400729a62bfc320eed2637646a728c243abacd7e26f22e76b5b12006dbd0c70bcb4a7da WHIRLPOOL 04ac240b99c5a0a3a2e0f80e7edd6ab0fd85939676016877f595d5698c8238d754ca4deb697eea507744bb936f64f6011548aa062751d99ffcc47a24362dbf4f
diff --git a/app-misc/when/when-1.1.35.ebuild b/app-misc/when/when-1.1.35.ebuild
new file mode 100644
index 0000000000000..3be68497f5a21
--- /dev/null
+++ b/app-misc/when/when-1.1.35.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
+HOMEPAGE="http://www.lightandmatter.com/when/when.html"
+SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/when_dist
+
+src_prepare() {
+	# Fix path for tests
+	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
+}
+
+src_compile() { :; }
+
+src_test() {
+	# The when command requires these files, or attempts to run setup function.
+	mkdir "${HOME}"/.when || die 'mkdir failed'
+	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
+	emake test
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}