diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 230e66095574..1a7130ea960a 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2005/03/10 19:43:25 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/17 23:53:56 bouyer Exp $
 #
 
 DISTNAME=		xen-2.0.3-src
 PKGNAME=		xentools20-2.0.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/
 EXTRACT_SUFX=		.tgz
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-#DISTFILES+=		netbsd-xen-kernel-headers-040508.tar.gz
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.netbsd.org/Ports/xen/
@@ -16,6 +15,8 @@ COMMENT=		Userland Tools for Xen
 
 DEPENDS+=		${PYPKGPREFIX}-twisted*:../../net/py-twisted
 
+USE_PKGINSTALL=		yes
+
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 WRKSRC=			${WRKDIR}/xen-2.0/tools
@@ -49,9 +50,11 @@ SUBST_FILES.paths+=	python/xen/sv/Daemon.py
 SUBST_SED.paths=        -e "s|/usr/sbin|${PREFIX}/sbin|g"
 SUBST_MESSAGE.paths=    "Fixing hardcoded paths."
 
+RCD_SCRIPTS=		xend
+
 pre-build:
 	${MKDIR} ${WRKSRC}/libxc/xen/NetBSD
-	${CP} files/xenio.h ${WRKSRC}/libxc/xen/NetBSD
+	${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen/NetBSD
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/sysutils/xentools20/files/xend.sh b/sysutils/xentools20/files/xend.sh
new file mode 100644
index 000000000000..86ddc462b2dd
--- /dev/null
+++ b/sysutils/xentools20/files/xend.sh
@@ -0,0 +1,22 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: xend.sh,v 1.1 2005/03/17 23:53:56 bouyer Exp $
+#
+# PROVIDE: xend
+# REQUIRE: disks network
+
+if [ -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="xend"
+rcvar=$name
+command="@PREFIX@/sbin/xend"
+ctl_command="@PREFIX@/sbin/xend"
+start_cmd="echo starting ${command} && ${command} start"
+stop_cmd="echo stopping ${command} && ${command} stop"
+restart_cmd="echo restarting ${command} && ${command} restart"
+
+load_rc_config $name
+run_rc_command "$1"