diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 92e2b73272aa..7524a07b0469 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openfire
-PORTVERSION=	3.5.2
+PORTVERSION=	3.6.0
 CATEGORIES=	net-im java
 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index b9b9e36731d4..d2b4577239b0 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (openfire_src_3_5_2.tar.gz) = baf4ba4d9a72a936ddc82f3ce44c2cbe
-SHA256 (openfire_src_3_5_2.tar.gz) = 4c22131cc64fe31b6f93f5e0c24b42b85c4858f07f8f58806802322dd5f0a1db
-SIZE (openfire_src_3_5_2.tar.gz) = 50817738
+MD5 (openfire_src_3_6_0.tar.gz) = 6945981ee16cf4f7d344641120a9c7fc
+SHA256 (openfire_src_3_6_0.tar.gz) = ec29461461f2bec40d04f58b7e4b70993b2eca2c813463bb613fd7139b0435fb
+SIZE (openfire_src_3_6_0.tar.gz) = 51121081
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 0968a49395ea..571621d7b136 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -173,6 +173,8 @@
 %%DATADIR%%/plugins/admin/webapp/images/wait24trans.gif
 %%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-bigblue.gif
 %%DATADIR%%/plugins/admin/webapp/images/yahoo-gray.gif
+%%DATADIR%%/plugins/admin/webapp/images/enterprise.png
+%%DATADIR%%/plugins/admin/webapp/images/star-16x16.gif
 %%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg-top.gif
 %%DATADIR%%/plugins/admin/webapp/images/setup_language_zh_CN.gif
 %%DATADIR%%/plugins/admin/webapp/images/twisty_closed_9x9.gif
@@ -268,12 +270,40 @@
 %%DATADIR%%/resources/database/upgrade/16/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/16/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/17/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/18/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_oracle.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/19/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_mysql.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_postgresql.sql
 %%DATADIR%%/resources/database/upgrade/2/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_db2.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_sybase.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_sqlserver.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_postgresql.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_mysql.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_hsqldb.sql
+%%DATADIR%%/resources/database/upgrade/20/openfire_oracle.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql
@@ -348,6 +378,7 @@
 @dirrm %%DATADIR%%/resources/database/upgrade/6
 @dirrm %%DATADIR%%/resources/database/upgrade/5
 @dirrm %%DATADIR%%/resources/database/upgrade/4
+@dirrm %%DATADIR%%/resources/database/upgrade/20
 @dirrm %%DATADIR%%/resources/database/upgrade/2
 @dirrm %%DATADIR%%/resources/database/upgrade/10
 @dirrm %%DATADIR%%/resources/database/upgrade/11
@@ -356,6 +387,9 @@
 @dirrm %%DATADIR%%/resources/database/upgrade/14
 @dirrm %%DATADIR%%/resources/database/upgrade/15
 @dirrm %%DATADIR%%/resources/database/upgrade/16
+@dirrm %%DATADIR%%/resources/database/upgrade/17
+@dirrm %%DATADIR%%/resources/database/upgrade/18
+@dirrm %%DATADIR%%/resources/database/upgrade/19
 @dirrm %%DATADIR%%/resources/database/upgrade/1
 @dirrm %%DATADIR%%/resources/database/upgrade
 @dirrm %%DATADIR%%/resources/database