--- /usr/portage/net-im/ejabberd/ejabberd-2.1.9.ebuild	2012-03-06 13:01:20.000000000 +0100
+++ ejabberd-2.1.9-r1.ebuild	2012-03-28 17:16:06.000000000 +0200
@@ -15,7 +15,7 @@
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
 EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
+IUSE="captcha debug ldap odbc pam remoteroster +web zlib ${EJABBERD_MODULES}"
 
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/expat-1.95
@@ -46,6 +46,13 @@
 		EPATCH_OPTS="-p2" epatch "${WORKDIR}/ejabberd-mod_statsdx-1080.patch"
 	fi
 
+	if use remoteroster; then
+		ewarn "Remote roster has not yet been accepted for consideration or"
+		ewarn "approved in any official manner by the XMPP Standards Foundation,"
+		ewarn "and is not yet an XMPP Extension Protocol (XEP)."
+		EPATCH_OPTS="-d ${WORKDIR}/${P}" epatch "${FILESDIR}/ejabberd-2.1.x-remote-roster.patch"
+	fi
+
 	# don't install release notes (we'll do this manually)
 	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
 	# Set correct paths