diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
new file mode 100644
index 0000000..af974c1
--- /dev/null
+++ b/net-im/openfire/Manifest
@@ -0,0 +1,20 @@
+AUX buildxml-3.3.0.patch 754 RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 SHA1 75909209a42f9befb2854c4852e65d14e7235371 SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6
+MD5 03fd3398f5d0db0e2ec644c2c2f821de files/buildxml-3.3.0.patch 754
+RMD160 b35b1c11865a528ec4228ef56304dc2ebb93cc09 files/buildxml-3.3.0.patch 754
+SHA256 55e8ea71dacdb205e960f255ea67fc90602e93fb3a0995485eb2851f6115bdf6 files/buildxml-3.3.0.patch 754
+AUX conf.d/openfire 491 RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 SHA1 2bee73a734d5e9ef8ba17f3074c9eba01b4cec6b SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5
+MD5 026fe96118d6451e29e72af8538dd8eb files/conf.d/openfire 491
+RMD160 60b9dfbda4bebabd3e59d90959b0317a6ed60413 files/conf.d/openfire 491
+SHA256 60f2ef123218338bbcdf2fb99c4f55740dab21f28e80073a157f1d63c99c05f5 files/conf.d/openfire 491
+AUX init.d/openfire 571 RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 SHA1 264ab08172d7559b79a927395ca32926e9da4cf8 SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac
+MD5 6922c9067f3e3ee6be5b77d38e9104ab files/init.d/openfire 571
+RMD160 60b623193a8e7eb63f9527ba99d517a5f48cf986 files/init.d/openfire 571
+SHA256 89a72c7bac03d932f46c721fd73fe3cc3545892398c2b5f762cda3c25c88f6ac files/init.d/openfire 571
+DIST openfire_src_3_3_0.tar.gz 18793873 RMD160 cf99135734d069a26df0b88f0b8ef316d434a39c SHA1 10b4ae0983211662b566fc0b7a48aee2b2cd6a05 SHA256 1bfff0c896337d5bf44db30e8c570942202ec16edd5b9d53c8d5e72a035c96a4
+EBUILD openfire-3.3.0.ebuild 2831 RMD160 bc4a2142bf747cfa0cc76b9aa77e157f5d0d42fa SHA1 bed467fb0cebf96b8ba5083a155b5e9f17180ecf SHA256 35f29f061f5283834ad33d6f10fd315bef168063018dbe16dd719e1dba6a7787
+MD5 2a913d3cbf52d4fc4e354aae154569d9 openfire-3.3.0.ebuild 2831
+RMD160 bc4a2142bf747cfa0cc76b9aa77e157f5d0d42fa openfire-3.3.0.ebuild 2831
+SHA256 35f29f061f5283834ad33d6f10fd315bef168063018dbe16dd719e1dba6a7787 openfire-3.3.0.ebuild 2831
+MD5 ec67ab90a99e394fa50f930e787cff18 files/digest-openfire-3.3.0 262
+RMD160 f49ae087e66da01faa2340a4ec1793f62b10ac9c files/digest-openfire-3.3.0 262
+SHA256 91aa6f5da22b58cb1bbf6d7d00003ca9831c6610a96a54746a7c4a5c10a70d2e files/digest-openfire-3.3.0 262
diff --git a/net-im/openfire/files/buildxml-3.3.0.patch b/net-im/openfire/files/buildxml-3.3.0.patch
new file mode 100644
index 0000000..eb52f28
--- /dev/null
+++ b/net-im/openfire/files/buildxml-3.3.0.patch
@@ -0,0 +1,20 @@
+--- build/build.xml 2007-04-13 21:00:32.000000000 +0000
++++ build/build.xml 2007-04-16 23:11:05.000000000 +0000
+@@ -1133,7 +1133,7 @@
+
+
+
+-
++
+
+
+
+@@ -1143,7 +1143,7 @@
+
+
+
+-
++
+
+
+
diff --git a/net-im/openfire/files/conf.d/openfire b/net-im/openfire/files/conf.d/openfire
new file mode 100644
index 0000000..35caece
--- /dev/null
+++ b/net-im/openfire/files/conf.d/openfire
@@ -0,0 +1,11 @@
+OPENFIRE_HOME=/opt/openfire
+OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
+OPENFIRE_OPTS="-Xmx256m -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB}"
+OPENFIRE_CLASS="-classpath ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_JAR="-jar ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_ARGS="-server ${OPENFIRE_OPTS} ${OPENFIRE_CLASS} ${OPENFIRE_JAR}"
+
+
+#JVM used by the openfire server. You can see a list of available vm's in /usr/lib/jvm/
+#But remenber that openfire needs a 1.5 jvm
+GENTOO_VM=sun-jdk-1.5
diff --git a/net-im/openfire/files/digest-openfire-3.3.0 b/net-im/openfire/files/digest-openfire-3.3.0
new file mode 100644
index 0000000..37ea544
--- /dev/null
+++ b/net-im/openfire/files/digest-openfire-3.3.0
@@ -0,0 +1,3 @@
+MD5 b2c6de82215b62ddcb4804641405a785 openfire_src_3_3_0.tar.gz 18793873
+RMD160 cf99135734d069a26df0b88f0b8ef316d434a39c openfire_src_3_3_0.tar.gz 18793873
+SHA256 1bfff0c896337d5bf44db30e8c570942202ec16edd5b9d53c8d5e72a035c96a4 openfire_src_3_3_0.tar.gz 18793873
diff --git a/net-im/openfire/files/init.d/openfire b/net-im/openfire/files/init.d/openfire
new file mode 100755
index 0000000..272e66d
--- /dev/null
+++ b/net-im/openfire/files/init.d/openfire
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+
+depend() {
+ need net
+ provide jabber-server
+}
+
+
+
+start() {
+ #source /etc/env.d/java/20sun-jdk-1.5.0.06
+ #OPENFIRE_CMD="${JAVA_HOME}/bin/java"
+ OPENFIRE_CMD=`GENTOO_VM=${GENTOO_VM} java-config -J`
+
+ ebegin "Starting Openfire Server"
+ start-stop-daemon --chuid jabber --background --make-pidfile --pidfile /var/run/jabber/openfire.pid --start --startas ${OPENFIRE_CMD} -- ${OPENFIRE_ARGS} > /var/log/openfire.log 2>&1
+ eend
+}
+
+stop() {
+ ebegin "Stopping Openfire Messenger"
+ start-stop-daemon --pidfile /var/run/jabber/openfire.pid --stop
+ eend
+}
diff --git a/net-im/openfire/openfire-3.3.0.ebuild b/net-im/openfire/openfire-3.3.0.ebuild
new file mode 100644
index 0000000..387e12a
--- /dev/null
+++ b/net-im/openfire/openfire-3.3.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.2.0_rc2.ebuild,v 1.2 2007/03/06 01:00:48 humpback Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=" >=virtual/jre-1.5 "
+# Doesn't build against Java 1.6 due to changes in JDBC API
+DEPEND="net-im/jabber-base
+ =virtual/jdk-1.5*
+ >=dev-java/ant-1.6
+ =dev-java/commons-net-1.4"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+pkg_setup() {
+ if [ -f /etc/env.d/98openfire ]; then
+ einfo "This is an upgrade"
+ else
+ ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+ ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+ ewarn "For more info see bug #139708"
+ sleep 11
+ fi
+}
+
+src_unpack() {
+ unpack ${PN//-/_}_src_${PV//./_}.tar.gz
+ cd ${S}
+ epatch ${FILESDIR}/buildxml-${PV}.patch
+
+ # TODO should replace jars in build/lib with ones packaged by us -nichoj
+}
+
+src_compile() {
+ # Jikes doesn't support -source 1.5
+ java-pkg_filter-compiler jikes
+
+ eant -f build/build.xml openfire plugins plugins-dev $(use_doc)
+}
+
+src_install() {
+ dodir /opt/openfire
+
+ doinitd ${FILESDIR}/init.d/openfire
+ doconfd ${FILESDIR}/conf.d/openfire
+
+ dodir /opt/openfire/conf
+ insinto /opt/openfire/conf
+ newins target/openfire/conf/openfire.xml openfire.xml.sample
+
+ dodir /opt/openfire/logs
+ keepdir /opt/openfire/logs
+
+ dodir /opt/openfire/lib
+ insinto /opt/openfire/lib
+ doins target/openfire/lib/*
+
+ dodir /opt/openfire/plugins
+ insinto /opt/openfire/plugins
+ doins -r target/openfire/plugins/*
+
+ dodir /opt/openfire/resources
+ insinto /opt/openfire/resources
+ doins -r target/openfire/resources/*
+
+ if use doc; then
+ dohtml -r documentation/docs/*
+ fi
+ dodoc documentation/dist/*
+
+ #Protect ssl key on upgrade
+ dodir /etc/env.d/
+ echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > ${D}/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+ chown -R jabber:jabber /opt/openfire
+
+ ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample
+ ewarn and save it as /opt/openfire/conf/openfire.xml
+ einfo
+ ewarn The following must be be owned or writable by the jabber user.
+ einfo /opt/openfire/conf/openfire.xml
+ einfo
+ ewarn If you are upgrading please have a look at the Wildfire to Openfire Upgrade Guide:
+ ewarn http://wiki.igniterealtime.org/display/WILDFIRE/Wildfire+to+Openfire+Upgrade+Guide
+ einfo
+}