Index: Makefile
===================================================================
--- Makefile	(revision 434285)
+++ Makefile	(working copy)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	graylog
-PORTVERSION=	1.3.3
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils java
-MASTER_SITES=	https://packages.graylog2.org/releases/graylog2-server/ \
-		http://packages.graylog2.org/releases/graylog2-server/
+MASTER_SITES=	https://packages.graylog2.org/releases/graylog/ \
+		http://packages.graylog2.org/releases/graylog/
 
 MAINTAINER=	thomas@bartelmess.io
 COMMENT=	Tool for centralized log collection
@@ -22,23 +22,32 @@
 GRAYLOG_DIR=	${PREFIX}/${PORTNAME}
 
 USE_RC_SUBR=	graylog
+SUB_FILES=	server.conf.sample pkg-message
 
 GRAYLOGUSER?=	graylog
 GRAYLOGGROUP?=	${GRAYLOGUSER}
 USERS=		${GRAYLOGUSER}
 GROUPS=		${GRAYLOGGROUP}
+GRAYLOG_DATA_DIR=	/var/db/graylog
 
 SUB_LIST=	GRAYLOGUSER=${GRAYLOGUSER} \
 		GRAYLOGGROUP=${GRAYLOGGROUP} \
 		JAVA_HOME=${JAVA_HOME} \
 		GRAYLOG_DIR=${GRAYLOG_DIR} \
+		ETCDIR=${ETCDIR} \
+		GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR}
+
+PLIST_SUB=	GRAYLOG_DATA_DIR=${GRAYLOG_DATA_DIR} \
+		GRAYLOGUSER=${GRAYLOGUSER} \
+		GRAYLOGGROUP=${GRAYLOGGROUP} \
 		ETCDIR=${ETCDIR}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${GRAYLOG_DIR}
-	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/server
+	${MKDIR} ${GRAYLOG_DATA_DIR}
 	${INSTALL_DATA} ${WRKSRC}/graylog.jar ${STAGEDIR}${GRAYLOG_DIR}
-	${INSTALL_DATA} ${WRKSRC}/graylog.conf.example ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${FILESDIR}/graylog_logging.xml ${STAGEDIR}${ETCDIR}
+	(cd ${WRKSRC}/plugin && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAYLOG_DIR}/plugin)
+	${INSTALL_DATA} ${WRKDIR}/server.conf.sample ${STAGEDIR}${ETCDIR}/server/server.conf.sample
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 434285)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (graylog-1.3.3.tgz) = 1e98509376dc22ff1602838cebb49b4732618296acc58063ba34f4a97f667ba0
-SIZE (graylog-1.3.3.tgz) = 70204863
+TIMESTAMP = 1485737319
+SHA256 (graylog-2.2.0.tgz) = 1e3b77a1706245515581fb2db278fcf9ee0e7d1837af3f15e657878ca17e6b61
+SIZE (graylog-2.2.0.tgz) = 99202010
Index: files/graylog.in
===================================================================
--- files/graylog.in	(revision 434285)
+++ files/graylog.in	(working copy)
@@ -34,17 +34,17 @@
 #   Default value: %%GRAYLOG_DIR%%
 #   Path the the graylog installation.
 #
+# graylog_data_dir (string):
+#   Default vaule: %%GRAYLOG_DATA_DIR%%
+#   Storage location for the graylog journal
+#
 # graylog_run_dir (string):
 #   Default value: /var/graylog
 #   Path the the graylog run folder.
 #
-# graylog_java_home (string):
-#   Default value: %%JAVA_HOME%%
-#   Root directory of the desired Java SDK.
-#
-# graylog_log4j_config (string):
-#   Default value: file://%%ETCDIR%%/graylog_logging.xml
-#   Path to the log4j configuration file for graylog
+# graylog_log_file (string):
+#   Default value: /var/log/graylog-server.conf
+#   Path for the Graylog Server logfile
 
 . /etc/rc.subr
 
@@ -55,13 +55,13 @@
 : ${graylog_enable:="NO"}
 : ${graylog_user:="%%GRAYLOGUSER%%"}
 : ${graylog_group:="%%GRAYLOGGROUP%%"}
-: ${graylog_config:="%%ETCDIR%%/${name}.conf"}
+: ${graylog_config:="%%ETCDIR%%/server/server.conf"}
 : ${graylog_min_mem:="256m"}
 : ${graylog_max_mem:="1g"}
 : ${graylog_dir:="%%GRAYLOG_DIR%%"}
-: ${graylog_run_dir:="/var/graylog"}
-: ${graylog_java_home:="%%JAVA_HOME%%"}
-: ${graylog_log4j_config="file://%%ETCDIR%%/graylog_logging.xml"}
+: ${graylog_data_dir:="%%GRAYLOG_DATA_DIR%%"}
+: ${graylog_run_dir:="/var/run/graylog"}
+: ${graylog_log_file:="/var/log/graylog-server.log"}
 
 
 java_options=" -Xms${graylog_min_mem} \
@@ -72,25 +72,33 @@
                -XX:+CMSConcurrentMTEnabled \
                -XX:+CMSClassUnloadingEnabled \
                -XX:+UseParNewGC \
-               -XX:-OmitStackTraceInFastThrow\
-               -Djava.library.path=${graylog_dir}/lib/sigar \
-               -Dlog4j.configuration=${graylog_log4j_config}"
+               -XX:-OmitStackTraceInFastThrow"
 
 start_precmd="graylog_precmd"
 
-pidfile=/var/run/${name}.pid
-command=/usr/sbin/daemon
-procname=`env JAVAVM_DRYRUN=true JAVA_VERSION=1.7+ %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -f 2 -d =`
+pidfile="${graylog_run_dir}/${name}.pid"
+command=/usr/bin/nohup
 
-command_args="-p $pidfile -f /usr/local/bin/java ${java_options} -jar ${graylog_dir}/graylog.jar server --configfile ${graylog_config} --no-pid-file"
+command_args="java -jar /usr/local/graylog/graylog.jar server \
+              --configfile \"${graylog_config}\" \
+              --pidfile \"${pidfile}\" \
+              >> \"${graylog_log_file}\" \
+              2>> \"${graylog_log_file}\" &"
 
 graylog_precmd() {
-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog
-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 /var/log/graylog/server
-    /usr/bin/install -d -o ${graylog_group} -g ${graylog_group} -m 755 ${graylog_run_dir}
-    touch $pidfile
-    chown ${graylog_user}:${graylog_group} ${pidfile}
-    cd ${graylog_run_dir}
+    if [ ! -f "${graylog_config}" ]; then
+        echo "Configuration file ${graylog_config} not found"
+        exit 1
+    fi
+
+    if [ ! -f "${graylog_log_file}" ]; then
+        touch "${graylog_log_file}"
+        chown "${graylog_user}:${graylog_group}" "${graylog_log_file}"
+        chmod 640 "${graylog_log_file}"
+    fi
+
+    install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_data_dir}"
+    install -d -o ${graylog_user} -g ${graylog_group} -m 750 "${graylog_run_dir}"
 }
 
 run_rc_command "$1"
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 434285)
+++ pkg-plist	(working copy)
@@ -1,3 +1,10 @@
-%%ETCDIR%%/graylog.conf.example
-%%ETCDIR%%/graylog_logging.xml
+@sample(%%GRAYLOGUSER%%,%%GRAYLOGGROUP%%,440) %%ETCDIR%%/server/server.conf.sample
+@unexec if [ -d %%GRAYLOG_DATADIR%% ]; then echo "You should remove %%GRAYLOG_DATADIR%% if you don't need it any more."; fi
 graylog/graylog.jar
+graylog/plugin/graylog-plugin-anonymous-usage-statistics-2.2.0.jar
+graylog/plugin/graylog-plugin-beats-2.2.0.jar
+graylog/plugin/graylog-plugin-collector-2.2.0.jar
+graylog/plugin/graylog-plugin-enterprise-integration-2.2.0.jar
+graylog/plugin/graylog-plugin-map-widget-2.2.0.jar
+graylog/plugin/graylog-plugin-pipeline-processor-2.2.0.jar
+