diff --git a/www-apps/groupoffice/Manifest b/www-apps/groupoffice/Manifest
new file mode 100644
index 0000000..d0b29d1
--- /dev/null
+++ b/www-apps/groupoffice/Manifest
@@ -0,0 +1,3 @@
+AUX postinstall-en.txt 707 RMD160 610098a7d5bd4010e1023b6717d8996100fd063e SHA1 d02856f438371c5a309dc85df67e29e57a344555 SHA256 8f3f1efcf2d9cca8c63254175cff3566fd4d733b8e630c4d141f28240901309f
+DIST groupoffice-com-3.2.31.tar.gz 6332425 RMD160 245027ea75424fbd9f5084fd7127520de9efa6d9 SHA1 7fd7ca7591128f6cd727825d8057738a3f37dba5 SHA256 f6d039dcb245ff9e85289f5a929a65e118dca49c8b16a45a31fc296560b4a7f0
+EBUILD groupoffice-3.2.31.ebuild 1498 RMD160 be051910019c067c82ba33cbeea6d289b5c14c8d SHA1 cee5425dfaefeba649f13c11c0345e46b196fc82 SHA256 9b66e6b70959025558f5ebb54bcbc8c8f4c3336de968171d69f42d39995ad6ce
diff --git a/www-apps/groupoffice/files/postinstall-en.txt b/www-apps/groupoffice/files/postinstall-en.txt
new file mode 100644
index 0000000..2ed6251
--- /dev/null
+++ b/www-apps/groupoffice/files/postinstall-en.txt
@@ -0,0 +1,19 @@
+Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+to complete the install.
+
+Note: User data are stored in ${VHOST_ROOT}/groupoffice-<VERSION>/userdata
+Local data are stored in ${MY_INSTALLDIR}/local
+
+When you are done with the installation,
+rm -Rf ${MY_INSTALLDIR}/install/
+or use an .htaccess file to secure the installation directory.
+
+--------------------------------------------------------------
+ADDITIONAL FUNCTIONALITY:
+
+net-mail/tnef:      Install this package to decode winmail.dat
+                    attachments in the email component.
+
+dev-libs/libwbxml:  Install this package if you use the
+                    professional groupoffice version including
+                    SyncML support
diff --git a/www-apps/groupoffice/groupoffice-3.2.31.ebuild b/www-apps/groupoffice/groupoffice-3.2.31.ebuild
new file mode 100644
index 0000000..7c6bc9e
--- /dev/null
+++ b/www-apps/groupoffice/groupoffice-3.2.31.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/groupoffice/groupoffice-2.18.6.ebuild,v 1.4 2008/08/25 15:31:05 armin76 Exp $
+
+inherit eutils webapp depend.php versionator
+
+MY_PV=$(get_version_component_range 1-2)
+
+S=${WORKDIR}/${PN}-com-${PV}
+DESCRIPTION="Group-Office is a powerful modular Intranet application framework"
+HOMEPAGE="http://group-office.sourceforge.net/"
+SRC_URI="mirror://sourceforge/group-office/files/${MY_PV}/${PN}-com-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+		 app-arch/unzip
+		 virtual/httpd-cgi"
+
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+	elog "PHP needs to be compiled with iconv support"
+	elog "If you are using php-5*, be sure it's compiled with USE=iconv"
+	require_php_with_use imap mysql calendar
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="CHANGELOG.TXT FAQ.TXT RELEASE.TXT"
+
+	dodoc ${docs} LICENSE.* INSTALL.TXT
+
+	cp -r . "${D}${MY_HTDOCSDIR}"
+	for doc in ${docs}; do
+		rm -f "${D}${MY_HTDOCSDIR}/${doc}"
+	done
+
+	touch "${D}${MY_HTDOCSDIR}"/config.php
+	dodir "${MY_HOSTROOTDIR}/${P}"/userdata "${MY_HTDOCSDIR}"/local
+
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	webapp_serverowned -R "${MY_HOSTROOTDIR}/${P}"/userdata
+#	webapp_serverowned "${MY_HTDOCSDIR}"/local
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}