diff --git a/sysutils/jailutils/Makefile b/sysutils/jailutils/Makefile
index d689599e6601..d64dce3ce815 100644
--- a/sysutils/jailutils/Makefile
+++ b/sysutils/jailutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jailutils
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://memberwebs.com/nielsen/freebsd/jails/jailutils/
 
@@ -15,6 +15,17 @@ COMMENT=	Several utilies for managing jails
 
 GNU_CONFIGURE=	YES
 
-MAN8=		jails.8 killjail.8
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+SUP_OS_VER=     400000
+.if ${OSVERSION} < ${SUP_OS_VER}
+BROKEN=         "OS versions prior to ${SUP_OS_VER} is not supported"
+.elif ${OSVERSION} > 501000
+PLIST_FILES=	sbin/jps sbin/jid sbin/jstart sbin/jkill sbin/jails
+MAN8=		jps.8 jid.8 jstart.8 jkill.8 jails.8
+.else
+PLIST_FILES=	sbin/jails sbin/jstart sbin/killjail
+MAN8=		jails.8 jstart.8 killjail.8
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/jailutils/distinfo b/sysutils/jailutils/distinfo
index 670e7586a0af..b3251d019a8e 100644
--- a/sysutils/jailutils/distinfo
+++ b/sysutils/jailutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (jailutils-0.5.4.tar.gz) = 8d354a92c4eda2b03ec2cd1f39f10ee8
-SIZE (jailutils-0.5.4.tar.gz) = 60193
+MD5 (jailutils-0.6.tar.gz) = c6b52a67bf1d1f2d460493c34cadd171
+SIZE (jailutils-0.6.tar.gz) = 79123
diff --git a/sysutils/jailutils/pkg-descr b/sysutils/jailutils/pkg-descr
index 76b874de5949..ca892915d9c3 100644
--- a/sysutils/jailutils/pkg-descr
+++ b/sysutils/jailutils/pkg-descr
@@ -1,9 +1,17 @@
 Several utilies for managing jails.
 
-killjail:	shutdown or restart a jail (when used with jailer)
-jails:		list the jails running on a system
+4.x:
 
-WWW: http://memberwebs.com/nielsen/freebsd/jails/
+killjail	shutdown or restart a jail (when used with jailer)
+jails		list the jails running on a system
+jstart		start up a jail securely
 
--- Sergey Skvortsov
-skv@FreeBSD.org
+5.x:
+
+jps		List processes in a jail
+jid		Print id of a jail
+jstart		Start up a jail securily
+jkill		Shutdown a jail in an orderly fashion
+jails		List running jails
+
+WWW: http://memberwebs.com/nielsen/freebsd/jails/jailutils/
diff --git a/sysutils/jailutils/pkg-plist b/sysutils/jailutils/pkg-plist
deleted file mode 100644
index 96589b19fe50..000000000000
--- a/sysutils/jailutils/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-sbin/jails
-sbin/killjail