Index: x11-servers/xephyr/Makefile
===================================================================
--- x11-servers/xephyr/Makefile
+++ x11-servers/xephyr/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xephyr
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	X server from X.Org based on kdrive
 
Index: x11-servers/xorg-dmx/Makefile
===================================================================
--- x11-servers/xorg-dmx/Makefile
+++ x11-servers/xorg-dmx/Makefile
@@ -1,7 +1,7 @@
 # Created by: lesi@FreeBSD.org
 
 PORTNAME=	xorg-dmx
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	Distributed Multihead X from X.Org
 
Index: x11-servers/xorg-nestserver/Makefile
===================================================================
--- x11-servers/xorg-nestserver/Makefile
+++ x11-servers/xorg-nestserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 PORTNAME=	xorg-nestserver
-PORTREVISION=	1
+PORTREVISION=	0
 PORTEPOCH=	2
 
 COMMENT=	Nesting X server from X.Org
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile
+++ x11-servers/xorg-server/Makefile
@@ -1,8 +1,8 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 PORTNAME?=	xorg-server
-PORTVERSION?=	1.20.11
-PORTREVISION?=	3
+PORTVERSION?=	1.20.13
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -52,7 +52,7 @@
 DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' ,
 PLIST_SUB+=	FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
 
-USES=		compiler:c11 cpe gl gmake perl5 ssl xorg xorg-cat:xserver
+USES=		compiler:c11 cpe gl gmake perl5 ssl tar:xz xorg xorg-cat:xserver
 USE_PERL5=	build
 USE_GL+=	gl
 USE_XORG+=	pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans
Index: x11-servers/xorg-server/distinfo
===================================================================
--- x11-servers/xorg-server/distinfo
+++ x11-servers/xorg-server/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1618327364
-SHA256 (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
-SIZE (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 6476116
-SHA256 (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 2e0f1027e56e1512f659dc5cc48400de9bea722e516b05498a7c6a4130f09f55
-SIZE (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 3867
-SHA256 (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 5f0996f07af30d6d55713def544aa4b3280909ed91a36cd495ca2ace517b328b
-SIZE (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 3606
+TIMESTAMP = 1634455742
+SHA256 (xorg/xserver/xorg-server-1.20.13.tar.xz) = 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+SIZE (xorg/xserver/xorg-server-1.20.13.tar.xz) = 5122260
Index: x11-servers/xorg-vfbserver/Makefile
===================================================================
--- x11-servers/xorg-vfbserver/Makefile
+++ x11-servers/xorg-vfbserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 PORTNAME=	xorg-vfbserver
-PORTREVISION=	1
+PORTREVISION=	0
 PORTEPOCH=	1
 
 COMMENT=	X virtual framebuffer server from X.Org
Index: x11-servers/xwayland/Makefile
===================================================================
--- x11-servers/xwayland/Makefile
+++ x11-servers/xwayland/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xwayland
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	X Clients under Wayland