diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 0b297ac890b08fa797d17e87c1c8c37bad586cca..9b90f1c356a145247891a0a8fcd094c27a34827c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,6 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.
 
 # X.org requires lazy relocations to work.
+%define anolis_release .0.1
 %undefine _hardened_build
 %undefine _strict_symbol_defs_build
 
@@ -46,7 +47,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.11
-Release:   5%{?gitdate:.%{gitdate}}%{?dist}.2
+Release:   5%{?gitdate:.%{gitdate}}%{anolis_release}%{?dist}.2
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -200,6 +201,11 @@ Obsoletes: xorg-x11-glamor < %{version}-%{release}
 Provides: xorg-x11-glamor = %{version}-%{release}
 Obsoletes: xorg-x11-drv-modesetting < %{version}-%{release}
 Provides: xorg-x11-drv-modesetting = %{version}-%{release}
+Provides: /usr/bin/X
+Provides: /usr/bin/Xorg
+Provides: /usr/bin/cvt
+Provides: /usr/bin/gtf
+
 # Dropped from F25
 Obsoletes: xorg-x11-drv-vmmouse < 13.1.0-4
 
@@ -213,6 +219,7 @@ Requires: xorg-x11-drv-vesa
 %endif
 %endif
 Requires: libEGL
+Requires: glibc
 
 %description Xorg
 X.org X11 is an open source implementation of the X Window System.  It
@@ -225,7 +232,9 @@ upon.
 Summary: A nested server
 Group: User Interface/X
 Requires: xorg-x11-server-common >= %{version}-%{release}
+Requires: glibc
 Provides: Xnest
+Provides: /usr/bin/Xnest
 
 %description Xnest
 Xnest is an X server which has been implemented as an ordinary
@@ -239,7 +248,20 @@ applications without running them on their real X server.
 Summary: Distributed Multihead X Server and utilities
 Group: User Interface/X
 Requires: xorg-x11-server-common >= %{version}-%{release}
+Requires: glibc
 Provides: Xdmx
+Provides: /usr/bin/Xdmx
+Provides: /usr/bin/dmxaddinput
+Provides: /usr/bin/dmxaddscreen
+Provides: /usr/bin/dmxinfo
+Provides: /usr/bin/dmxreconfig
+Provides: /usr/bin/dmxresize
+Provides: /usr/bin/dmxrminput
+Provides: /usr/bin/dmxrmscreen
+Provides: /usr/bin/dmxtodmx
+Provides: /usr/bin/dmxwininfo
+Provides: /usr/bin/vdltodmx
+Provides: /usr/bin/xdmxconfig
 
 %description Xdmx
 Xdmx is proxy X server that provides multi-head support for multiple displays
@@ -260,7 +282,10 @@ License: MIT and GPLv2
 Requires: xorg-x11-server-common >= %{version}-%{release}
 # required for xvfb-run
 Requires: xorg-x11-xauth
+Requires: glibc
 Provides: Xvfb
+Provides: /usr/bin/Xvfb
+Provides: /usr/bin/xvfb-run
 
 %description Xvfb
 Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
@@ -274,7 +299,9 @@ is normally used for testing servers.
 Summary: A nested server
 Group: User Interface/X
 Requires: xorg-x11-server-common >= %{version}-%{release}
+Requires: glibc
 Provides: Xephyr
+Provides: /usr/bin/Xephyr
 
 %description Xephyr
 Xephyr is an X server which has been implemented as an ordinary
@@ -294,9 +321,11 @@ Requires: xorg-x11-util-macros
 Requires: xorg-x11-proto-devel
 Requires: libXfont2-devel
 Requires: pkgconfig pixman-devel libpciaccess-devel
+Requires: glibc
 Provides: xorg-x11-server-static
 Obsoletes: xorg-x11-glamor-devel < %{version}-%{release}
 Provides: xorg-x11-glamor-devel = %{version}-%{release}
+Provides: /usr/bin/xserver-sdk-abi-requires
 
 %description devel
 The SDK package provides the developmental files which are necessary for
@@ -314,6 +343,14 @@ BuildArch: noarch
 Xserver source code needed to build VNC server (Xvnc)
 
 
+%package doc
+Summary: Documents for %{name}
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+Doc pages for %{name}.
+
 %prep
 %autosetup -N -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 rm -rf .git
@@ -442,9 +479,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %endif
 }
 
+%files doc
+%doc COPYING
 
 %files common
-%doc COPYING
 %{_mandir}/man1/Xserver.1*
 %{_libdir}/xorg/protocol.txt
 %dir %{_localstatedir}/lib/xkb
@@ -532,7 +570,6 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %{_mandir}/man1/Xephyr.1*
 
 %files devel
-%doc COPYING
 #{_docdir}/xorg-server
 %{_bindir}/xserver-sdk-abi-requires
 %{_libdir}/pkgconfig/xorg-server.pc
@@ -545,6 +582,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Sat Jul 16 2022 Hangbo Fan <fanhangbo.fhb@alibaba-inc.com> - 1.20.11-5.2.0.1
+- Add doc sub package
+
 * Thu Jun 09 2022 Ray Strode <rstrode@redhat.com> - 1.20.11-5.2
 - Rebuild again for xtrans fix
   Related: #2090323