diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
index 4b3266620055..82a81743f165 100644
--- a/net-mgmt/xymon-client/Makefile
+++ b/net-mgmt/xymon-client/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	xymon
 PORTVERSION=	4.3.30
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-client${PKGNAMESUFFIX2}
 DIST_SUBDIR=	repacked
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	System for monitoring servers and networks - Client
 WWW=		http://xymon.sourceforge.net/
 
 LICENSE=	GPLv2
 
 USERS=	xymon
 GROUPS=	xymon
 
 # Options
 XYMONUSER?=	xymon
 XYMONHOSTIP?=	127.0.0.1
 
 SUB_LIST+=	XYMONUSER="${XYMONUSER}"
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe gmake
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
 MAKE_ENV+=	XYMONHOSTIP="${XYMONHOSTIP}"
 MAKE_ENV+=	INSTALLROOT="${STAGEDIR}"
 MAKE_ENV+=	PKGBUILD=1
 MAKE_ENV+=	MANPREFIX="${STAGEDIR}${PREFIX}/share"
 USE_RC_SUBR=	xymon-client
 PLIST_SUB+=	XYMONUSER="${XYMONUSER}"
 CONFIG_FILES=	clientlaunch.cfg xymonclient.cfg localclient.cfg
 
 # Configure script is interactive
 do-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/ext
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/logs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/client/tmp
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-client_Makefile
similarity index 100%
rename from net-mgmt/xymon-client/files/patch-Makefile
rename to net-mgmt/xymon-client/files/patch-client_Makefile
diff --git a/net-mgmt/xymon-client/files/patch-client_xymonclient-freebsd.sh b/net-mgmt/xymon-client/files/patch-client_xymonclient-freebsd.sh
new file mode 100644
index 000000000000..539a55184a6e
--- /dev/null
+++ b/net-mgmt/xymon-client/files/patch-client_xymonclient-freebsd.sh
@@ -0,0 +1,11 @@
+--- client/xymonclient-freebsd.sh.orig	2015-12-16 15:13:03 UTC
++++ client/xymonclient-freebsd.sh
+@@ -55,6 +55,8 @@ ps -axd -ww -o pid,ppid,user,start,state,pri,pcpu,cput
+ echo "[ps]"
+ # Don't use "args". "command" works also in FreeBSD 4.x.
+ ps -axd -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,command
++echo "[pkg"]
++pkg query %n-%v
+ 
+ # $TOP must be set, the install utility should do that for us if it exists.
+ if test "$TOP" != ""