Index: head/net-mgmt/riemann/Makefile
===================================================================
--- head/net-mgmt/riemann/Makefile
+++ head/net-mgmt/riemann/Makefile
@@ -1,15 +1,16 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	riemann
-PORTVERSION=	0.2.14
+PORTVERSION=	0.3.1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Monitors distributed systems
 
-LICENSE=	EPL
+LICENSE=	EPL APACHE20 CDDL MIT BSD3CLAUSE LGPL2+ BSD2CLAUSE GPLv2+
+LICENSE_COMB=	multi
 
 USES=		tar:bzip2
 NO_BUILD=	yes
@@ -33,7 +34,7 @@
 		${STAGEDIR}/var/log/riemann
 	${INSTALL_DATA} ${WRKSRC}/lib/riemann.jar \
 		${STAGEDIR}${JAVAJARDIR}/riemann.jar
-	${SED} -i -e "s:riemann.log:/var/log/riemann.log:g" \
+	${SED} -i -e "s:riemann.log:/var/log/riemann/riemann.log:g" \
 		${WRKSRC}/etc/riemann.config
 	${INSTALL_DATA} ${WRKSRC}/etc/riemann.config \
 		${STAGEDIR}${ETCDIR}/riemann.config.sample
Index: head/net-mgmt/riemann/distinfo
===================================================================
--- head/net-mgmt/riemann/distinfo
+++ head/net-mgmt/riemann/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501697423
-SHA256 (riemann-0.2.14.tar.bz2) = 165ee73ad10f5d187d559da1db8f99e151bba8c3bb1d774eb465ced23476fbce
-SIZE (riemann-0.2.14.tar.bz2) = 81960540
+TIMESTAMP = 1535139098
+SHA256 (riemann-0.3.1.tar.bz2) = 54f9799922c8cbad75bbbe36c7e5ad32cf932fb61149629ee0528eb178c58351
+SIZE (riemann-0.3.1.tar.bz2) = 83862795
Index: head/net-mgmt/riemann/files/riemann.in
===================================================================
--- head/net-mgmt/riemann/files/riemann.in
+++ head/net-mgmt/riemann/files/riemann.in
@@ -32,7 +32,7 @@
 : ${riemann_enable="NO"}
 : ${riemann_user:="riemann"}
 : ${riemann_group:="riemann"}
-: ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"}
+: ${riemann_config:="%%ETCDIR%%/riemann.config"}
 : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
 : ${riemann_java_home:="%%JAVA_HOME%%"}
 : ${riemann_min_mem:="256m"}
@@ -45,7 +45,6 @@
         -Xmx${riemann_max_mem} \
         -Xss256k \
         -Djava.awt.headless=true \
-        -Djava.net.preferIPv4Stack=true \
         -XX:+AggressiveOpts \
         -XX:+CMSClassUnloadingEnabled \
         -XX:+CMSParallelRemarkEnabled \