diff --git a/net/serviio/Makefile b/net/serviio/Makefile
index f3299a81a32e..00e326b1a0df 100644
--- a/net/serviio/Makefile
+++ b/net/serviio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	serviio
 PORTVERSION=	1.4.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia java www
 MASTER_SITES=	http://download.serviio.org/releases/
 EXTRACT_SUFX=	-linux.tar.gz
diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in
index f119db364b16..c09775032271 100644
--- a/net/serviio/files/serviio.in
+++ b/net/serviio/files/serviio.in
@@ -32,11 +32,12 @@ stop_cmd="$command -stop"
 
 status_cmd=${name}_status
 serviio_status() {
-	serviio_pid=$(ps -aU ${serviio_user} | awk '/java/ {print $1}')
+	serviio_pid=$(ps -wwwaU ${serviio_user} | awk '/java.*org.serviio.MediaServer/ {print $1}')
 	if [ -n "${serviio_pid}" ]; then
 		echo "${name} is running as pid ${serviio_pid}"
 	else
 		echo "${name} is not running"
+		return 1
 	fi
 }