diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild
similarity index 100%
rename from x11-base/xorg-server/xorg-server-21.1.1-r1.ebuild
rename to x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild
index 0990ccd85bcd3..9e885eb748138 100644
--- a/x11-base/xorg-server/xorg-server-21.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild
@@ -66,14 +66,14 @@ CDEPEND="
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	doc? (
-		x11-base/xorg-sgml-doctools
-	)
 	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
 "
 DEPEND="${CDEPEND}
 	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
+	doc? (
+		x11-base/xorg-sgml-doctools
+	)
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index ae87d221a62e5..2fb9a72911bce 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -66,14 +66,14 @@ CDEPEND="
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	doc? (
-		x11-base/xorg-sgml-doctools
-	)
 	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
 "
 DEPEND="${CDEPEND}
 	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
+	doc? (
+		x11-base/xorg-sgml-doctools
+	)
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )