diff -rupN old/app-admin/rsyslog/metadata.xml new/app-admin/rsyslog/metadata.xml
--- old/app-admin/rsyslog/metadata.xml	2014-10-17 08:31:02.000000000 +0200
+++ new/app-admin/rsyslog/metadata.xml	2015-01-16 00:59:22.000000000 +0100
@@ -16,6 +16,7 @@
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+		<flag name="kafka">Build the Apache Kafka output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
 		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
diff -rupN old/app-admin/rsyslog/rsyslog-8.6.0.ebuild new/app-admin/rsyslog/rsyslog-8.6.0.ebuild
--- old/app-admin/rsyslog/rsyslog-8.6.0.ebuild	2014-12-28 16:01:02.000000000 +0100
+++ new/app-admin/rsyslog/rsyslog-8.6.0.ebuild	2015-02-08 20:23:39.637091573 +0100
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild,v 1.2 2014/12/28 14:45:29 titanofold Exp $
 
@@ -22,7 +22,6 @@ if [[ ${PV} == "9999" ]]; then
 	"
 
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="
 		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -33,7 +32,8 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kafka kerberos mongodb mysql normalize omudpspoof"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
 
 RDEPEND="
 	>=dev-libs/json-c-0.11:=
@@ -44,12 +44,13 @@ RDEPEND="
 	elasticsearch? ( >=net-misc/curl-7.35.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
 	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
+	kafka? ( >=dev-libs/librdkafka-0.8.5:= )
 	kerberos? ( virtual/krb5 )
 	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
 	mysql? ( virtual/mysql )
 	normalize? (
 		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-1.0.0:=
+		>=dev-libs/liblognorm-1.1.0:=
 	)
 	omudpspoof? ( >=net-libs/libnet-1.1.6 )
 	postgres? ( >=dev-db/postgresql-8.4.20 )
@@ -71,12 +72,6 @@ fi
 
 BRANCH="8-stable"
 
-if [[ ${PV} < "8.7" ]]; then
-	# Test suite is broken in v8.6.0 release tarball
-	# Upstream is notified; Will be fixed with v8.7.0 in January
-	RESTRICT="test"
-fi
-
 # Maitainer note : open a bug to upstream
 # showing that building in a separate dir fails
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -180,6 +175,7 @@ src_configure() {
 		$(use_enable elasticsearch)
 		$(use_enable gcrypt libgcrypt)
 		$(use_enable jemalloc)
+		$(use_enable kafka omkafka)
 		$(use_enable kerberos gssapi-krb5)
 		$(use_enable normalize mmnormalize)
 		$(use_enable omudpspoof)
@@ -257,7 +253,7 @@ src_install() {
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+		doins plugins/ommysql/createDB.sql
 	fi
 
 	if use postgres; then