diff --git a/net-im/calculate-ejabberd/Manifest b/net-im/calculate-ejabberd/Manifest
index 3afd7d63e..f861357d3 100644
--- a/net-im/calculate-ejabberd/Manifest
+++ b/net-im/calculate-ejabberd/Manifest
@@ -2,6 +2,7 @@ AUX 2.0.0-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c
 AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 AUX ejabberd-2.0.2-r1.confd 841 RMD160 5e01a2b13e88f9f799386304f66d25ff1146a9cf SHA1 420fba1888c8a5fcaef47f59b9518a4a9ce36b6f SHA256 12719cadf9d20b8d36bc299c41f6e1a15ccd545048859e9e878706308d691dde
 AUX ejabberd-2.0.2-r2.initd 1280 RMD160 92f337b40cf33132917f400cdf6d533e093a35f5 SHA1 21d7f2c897945314ea2ef9eb4aa00e369e79a26c SHA256 29e768d925362ef221d484b2e257ae6b2d8b8d6dbf30f6ca2d9069fd27a214bc
+AUX ejabberd-2.0.2-r3.initd 1432 RMD160 531cc4634e9e953fa901a59b301ee9f09beab29e SHA1 89f9535545d25eb89572a6d630f01c58366b499a SHA256 b6c312b148b5b833ebd69f1429f302bb51f0852074530600aadbbe49733115f1
 AUX ejabberd-2.0.2.confd 840 RMD160 5227a3fbb0d0c8bffd8a5537003f965f1fb73582 SHA1 d3a51fa0923a571d30f3f0840834c651726ad206 SHA256 d6b0c44a450c4191e450b8e3ab281dc2e3bc668a97ddd1652d2e6c555675a2c6
 AUX ejabberd-2.0.2.initd 1134 RMD160 b5d3a5a50069be713511ebd37f9eab07dab33371 SHA1 0cd2c3bd44c1923014c1cdd84edfb56ddb11bdc2 SHA256 8b2c50bc80b5b0700195c79a4eaa6f68549fd63310b584c2e86d951c116e14de
 AUX ejabberd-wrapper-2.0.2.template 1273 RMD160 7ec1a86be5df671cb2ce54705de482ca1a172974 SHA1 ec412773c7913d8cfa59e6dcd330242268e60959 SHA256 96dcdca694fbe26b1098007d9e33361812a0ed532894e417155c0ac973bcdf6f
@@ -14,5 +15,5 @@ AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
 DIST ejabberd-2.0.2.tar.gz 1040817 RMD160 b24c1c2d6ce8c56fd26f28a98b89d99890dbad72 SHA1 7c82082b941277fe18aac25ca9b2016f25dc8472 SHA256 23136f2d215e82836d84322011914e1c9a846ab056b80cd26ff3e70b300b345a
 EBUILD calculate-ejabberd-2.0.2-r1.ebuild 5066 RMD160 f20ff9f3888f2d27f911b2c5dd4916092a2532fc SHA1 f42447b2eaf54e422ed1f1cd97d382ddfa6aa399 SHA256 16f2ee205b92eaa767668f632a25d18b85142e912431ff28a14bd058041a899c
-EBUILD calculate-ejabberd-2.0.2-r2.ebuild 5073 RMD160 36c6d9728d84f097c3c48850a671922036e9a7af SHA1 f93dcdbb3d80e8c6f5d26df59bdab87895739893 SHA256 a207cadb10320d5164291a18ce317162fb19ed44da950e03ab57b8a0a39a391a
+EBUILD calculate-ejabberd-2.0.2-r3.ebuild 5073 RMD160 b37dd12707fc6ce6a0b16c2354bdc07d3d65dd33 SHA1 4a5f6ead539536ac940043dfe5311259f9138274 SHA256 d599d46d89bb48f21a48bac1ce97c8712e09321ee48b0783e317c59d4e3b0d84
 EBUILD calculate-ejabberd-2.0.2.ebuild 4955 RMD160 392007636ef070def316e5d62c5d02c05ef21b51 SHA1 6382ac2f5b11cf10ac1e5a18928726ca140aa2c8 SHA256 6f6e10f69f66bf2859fc54f794f015809af35079245bbde1000b944ccd369e2c
diff --git a/net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r2.ebuild b/net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r3.ebuild
similarity index 98%
rename from net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r2.ebuild
rename to net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r3.ebuild
index 5e777e9ec..855ecb429 100644
--- a/net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r2.ebuild
+++ b/net-im/calculate-ejabberd/calculate-ejabberd-2.0.2-r3.ebuild
@@ -123,7 +123,7 @@ src_install() {
 	dodir /var/lib/ejabberd
 
 
-	newinitd "${FILESDIR}/${MY_P}-r2.initd" ${JABBER_NAME}
+	newinitd "${FILESDIR}/${MY_P}-r3.initd" ${JABBER_NAME}
 	newconfd "${FILESDIR}/${MY_P}-r1.confd" ${JABBER_NAME}
 
 	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
diff --git a/net-im/calculate-ejabberd/files/ejabberd-2.0.2-r3.initd b/net-im/calculate-ejabberd/files/ejabberd-2.0.2-r3.initd
new file mode 100644
index 000000000..80509c70f
--- /dev/null
+++ b/net-im/calculate-ejabberd/files/ejabberd-2.0.2-r3.initd
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.2.initd,v 1.1 2008/08/03 16:19:05 caleb Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use dns
+	need net
+	provide jabber-server
+}
+
+checkconfig() {
+	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
+		eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ejabberd"
+	# the process name of beam is different depending whether smp is used.
+	# set it explicitly so start-stop-daemon works
+	case "$HAVE_SMP" in
+		"1"|"true"|"yes")
+			BEAMNAME="beam.smp"
+			SMPOPT="enable"
+		;;
+		*)
+			BEAMNAME="beam"
+			SMPOPT="disable"
+		;;
+	esac
+	cd /var/lib/ejabberd
+	start-stop-daemon --start --quiet --chuid jabber:jabber \
+		--name $BEAMNAME \
+		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ejabberd"
+	/usr/sbin/ejabberdctl stop
+	RES=$?
+	sleep 1
+	if ps ax | grep "epmd -daemon" | grep -v "grep" >/dev/null;
+	then
+	    kill `ps ax | grep "epmd -daemon" | grep -v "grep" | awk '{print $1;}'`
+	fi
+	if ps ax | grep "ejabber" | grep "beam" >/dev/null;
+	then
+	    kill `ps ax | grep "ejabber" | grep "beam" | awk '{print $1}'`
+	fi
+	eend $RES
+}
+
+reload() {
+	ebegin "Reloading ejabberd"
+	/usr/sbin/ejabberdctl reopen-log
+	eend $?
+}
+