diff --git a/net-im/spectrum/files/spectrum2.initd b/net-im/spectrum/files/spectrum2.initd
index d9aaefb..5b8c3f7 100644
--- a/net-im/spectrum/files/spectrum2.initd
+++ b/net-im/spectrum/files/spectrum2.initd
@@ -1,7 +1,7 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 LOGFILE=/var/log/spectrum2/std.log
 
diff --git a/net-im/spectrum/spectrum-9999.ebuild b/net-im/spectrum/spectrum-9999.ebuild
index e2e0e62..9ed8069 100644
--- a/net-im/spectrum/spectrum-9999.ebuild
+++ b/net-im/spectrum/spectrum-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit cmake-utils systemd versionator
 
@@ -25,14 +25,13 @@ DESCRIPTION="Spectrum is a XMPP transport/gateway"
 HOMEPAGE="http://spectrum.im"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="0"
 IUSE_PLUGINS="frotz irc jabber purple sms twitter"
-IUSE="debug doc mysql postgres sqlite test ${IUSE_PLUGINS}"
+IUSE="debug doc libev mysql postgres sqlite test ${IUSE_PLUGINS}"
 
 RDEPEND="${RDEPEND}
 	=net-im/swift-9999[ssl]
 	dev-libs/boost:=
-	dev-libs/libev
 	dev-libs/log4cxx
 	dev-libs/openssl
 	dev-libs/popt
@@ -42,10 +41,10 @@ RDEPEND="${RDEPEND}
 	sqlite? ( dev-db/sqlite:3 )
 	irc? ( net-im/communi )
 	purple? ( >=net-im/pidgin-2.6.0 )
+	libev? ( dev-libs/libev )
 	"
 
 DEPEND="${RDEPEND}
-	dev-util/cmake
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
@@ -57,16 +56,17 @@ CMAKE_IN_SOURCE_BUILD=1
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable mysql MYSQL)
-		$(cmake-utils_use_enable postgres PQXX)
-		$(cmake-utils_use_enable sqlite SQLITE3)
-		$(cmake-utils_use_enable doc DOCS)
-		$(cmake-utils_use_enable frotz FROTZ)
-		$(cmake-utils_use_enable irc IRC)
-		$(cmake-utils_use_enable jabber SWIFTEN)
-		$(cmake-utils_use_enable purple PURPLE)
-		$(cmake-utils_use_enable sms SMSTOOLS3)
-		$(cmake-utils_use_enable twitter TWITTER)
+		$(cmake-utils_use_find_package libev event)
+		-DENABLE_MYSQL="$(usex mysql)
+		-DENABLE_PQXX="$(usex postgres)
+		-DENABLE_SQLITE3="$(usex sqlite)
+		-DENABLE_DOCS="$(usex doc)
+		-DENABLE_FROTZ="$(usex frotz)
+		-DENABLE_IRC="$(usex irc)
+		-DENABLE_SWIFTEN="$(usex jabber)
+		-DENABLE_PURPLE="$(usex purple)
+		-DENABLE_SMSTOOLS3="$(usex sms)
+		-DENABLE_TWITTER="$(usex twitter)
 		-DLIB_INSTALL_DIR=$(get_libdir)
 	)