diff --git a/net-im/ejabberd/ejabberd-16.01.ebuild b/net-im/ejabberd/ejabberd-16.01-r1.ebuild
similarity index 100%
rename from net-im/ejabberd/ejabberd-16.01.ebuild
rename to net-im/ejabberd/ejabberd-16.01-r1.ebuild
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
similarity index 99%
rename from net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
rename to net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
index 258df615503f7..3ca0b2f5a883d 100644
--- a/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
index 29a30da3610d8..18150a782c166 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd-3.initd
@@ -5,7 +5,7 @@
 
 depend() {
 	use dns
-	need net
+	need epmd net
 	provide jabber-server
 }