diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9d7e83103cf8..cdd827b0e42f 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1066,7 +1066,7 @@
     SUBDIR += xcpustate
     SUBDIR += xdu
     SUBDIR += xe-guest-utilities
-    SUBDIR += xen-tools
+    SUBDIR += xen-guest-tools
     SUBDIR += xfburn
     SUBDIR += xfce4-battery-plugin
     SUBDIR += xfce4-bsdcpufreq-plugin
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-guest-tools/Makefile
similarity index 98%
rename from sysutils/xen-tools/Makefile
rename to sysutils/xen-guest-tools/Makefile
index c097d19c4356..5721460cf574 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-guest-tools/Makefile
@@ -1,7 +1,7 @@
 # Created by: Evan Sarmiento <esarmiento@wayfair.com>
 # $FreeBSD$
 
-PORTNAME=	xen-tools
+PORTNAME=	xen-guest-tools
 PORTVERSION=	4.2.2
 PORTREVISION=	0
 CATEGORIES=	sysutils
diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-guest-tools/distinfo
similarity index 100%
rename from sysutils/xen-tools/distinfo
rename to sysutils/xen-guest-tools/distinfo
diff --git a/sysutils/xen-tools/files/patch-Config.mk b/sysutils/xen-guest-tools/files/patch-Config.mk
similarity index 100%
rename from sysutils/xen-tools/files/patch-Config.mk
rename to sysutils/xen-guest-tools/files/patch-Config.mk
diff --git a/sysutils/xen-tools/files/patch-config_StdGNU.mk b/sysutils/xen-guest-tools/files/patch-config_StdGNU.mk
similarity index 100%
rename from sysutils/xen-tools/files/patch-config_StdGNU.mk
rename to sysutils/xen-guest-tools/files/patch-config_StdGNU.mk
diff --git a/sysutils/xen-tools/files/patch-tools_xenstore_xs__lib.c b/sysutils/xen-guest-tools/files/patch-tools_xenstore_xs__lib.c
similarity index 100%
rename from sysutils/xen-tools/files/patch-tools_xenstore_xs__lib.c
rename to sysutils/xen-guest-tools/files/patch-tools_xenstore_xs__lib.c
diff --git a/sysutils/xen-tools/pkg-descr b/sysutils/xen-guest-tools/pkg-descr
similarity index 100%
rename from sysutils/xen-tools/pkg-descr
rename to sysutils/xen-guest-tools/pkg-descr