Index: head/net-mgmt/riemann/Makefile
===================================================================
--- head/net-mgmt/riemann/Makefile
+++ head/net-mgmt/riemann/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	riemann
-PORTVERSION=	0.2.11
-PORTREVISION=	1
+PORTVERSION=	0.2.12
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
@@ -19,7 +18,7 @@
 JAVA_VERSION=	1.7+
 
 SUB_FILES=	${PORTNAME}
-SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
+SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		RIEMANN_USER=${RIEMANN_USER} \
 		RIEMANN_GROUP=${RIEMANN_GROUP} \
 		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
@@ -57,7 +56,7 @@
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${SED} -i -e "s:riemann.log:${RIEMANN_LOGDIR}${PORTNAME}.log:g" \
 		${WRKSRC}/etc/${PORTNAME}.config
-	${CP} -p ${WRKSRC}/etc/${PORTNAME}.config \
+	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.config \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.config.sample
 
 .include <bsd.port.mk>
Index: head/net-mgmt/riemann/distinfo
===================================================================
--- head/net-mgmt/riemann/distinfo
+++ head/net-mgmt/riemann/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473805695
-SHA256 (riemann-0.2.11.tar.bz2) = 5e7982002685f6fa7716782c57e227e4b4eeaa4c14a77ab586aac5ecf114e933
-SIZE (riemann-0.2.11.tar.bz2) = 40503519
+TIMESTAMP = 1484592882
+SHA256 (riemann-0.2.12.tar.bz2) = 79f21fb2ac90a3d55e7cfa4a1eb14d1bdcdb1266ba6052bb72e6e500467ca7f4
+SIZE (riemann-0.2.12.tar.bz2) = 41672027