diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6eed22e802569..69219d710479e 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,4 @@
-DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0
+DIST logstash-1.5.6.tar.gz 89916973 SHA256 812a809597c7ce00c869e5bb4f87870101fe6a43a2c2a6586f5cc4d1a4986092 SHA512 be28d9488d6c9bb7c993f922357edeea0229f0e92ad218da02376fb855ed211c076d099ce658d28e217462531b2ac9aeec0faf9a26ae254d118fa62f168496fb WHIRLPOOL 01d5467ecb099a78a9fe2e43c47fca1c0aa8c452d41863085d96188ee7cd719240809e1143905ebdb9f717d7eab8dbfaadbed49b260854090bee6d22240c688f
 DIST logstash-2.1.0.tar.gz 73512846 SHA256 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc SHA512 218355af77957a050bff262c1f0f9b516a9c8223a22a768d1c1a3c222c4d9e3ac67871608e6f34787a1926ac2ad2374ca0280a8a122a93b4e846c780c517984a WHIRLPOOL c22840cfadbc63490ee8e0a9ed101dcd9f3c06eca4d7b3359ae84073da6d9bb5712af1599357ff875b67eb55ad5d3e6e39634266e7e57024b4f97c23667e3b4a
+DIST logstash-2.1.1.tar.gz 73842493 SHA256 2ea975e16a02b416a5bd9eed5ab280224820f278d54f6e0ec4cccf0d8f5ca610 SHA512 5ef39ee5d6b5335bffc67450fbfd984aa513b2f4c8e7bf56cd3dacc876be7095195a40e2c7d17cc2f85c4d6b1b7ef5f0ae8953e4fc9642002d1dc17e36dcaed6 WHIRLPOOL e4737e1c1a12dea2bd11154dceb4754a5150f06a50cc9ed71c30f9749e6dea9c7484af82d341336527b3b85438f3c965c83eec8757f3fc19880fd60f5b1b1425
 DIST logstash-all-plugins-2.1.0.tar.gz 126053307 SHA256 090cca8b1d7584ed7f3a60abd4e5f4329cf36f41481de80982fee709e2febf58 SHA512 31232bdac13b8d342ac5d688c2fe0f60e6eede71e70c97d0a1e08527e1283ef348666f87d86f37e0c3208f56dc08595af18c924642fa94911f6fd19a39dab7f0 WHIRLPOOL 532676042bee4c120fdaf60c3d6cc528d6f9960d0c770bebfba773dd422663532c3f7de7b28baa085d3faaacd830a74e1f73f5020a5a9b7d48998dbdf931c117
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.6.ebuild
similarity index 87%
rename from app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
rename to app-admin/logstash-bin/logstash-bin-1.5.6.ebuild
index a7e0cacb3b630..8e718eaf84e9a 100644
--- a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-1.5.6.ebuild
@@ -14,7 +14,6 @@ SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
@@ -36,10 +35,10 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
 
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
 }
 
 pkg_postinst() {
diff --git a/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
new file mode 100644
index 0000000000000..f7b2060e0a29b
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index f82fc0180ff61..a853f25a46549 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
-	</maintainer>
 	<maintainer>
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomas Mozes</name>
@@ -15,4 +11,7 @@
 		<flag name="standard">standard distribution package</flag>
 		<flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">elastic/logstash</remote-id>
+	</upstream>
 </pkgmetadata>