diff --git a/.gitignore b/.gitignore
index ec7d8ab..cfced37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,137 +1 @@
-bigreqsproto-1.1.0.tar.bz2
-compositeproto-0.4.1.tar.bz2
-damageproto-1.2.0.tar.bz2
-dmxproto-2.3.tar.bz2
-evieext-1.1.0.tar.bz2
-fixesproto-4.1.1.tar.bz2
-fontsproto-2.1.0.tar.bz2
-glproto-1.4.9.tar.bz2
-kbproto-1.0.3.tar.bz2
-recordproto-1.14.tar.bz2
-renderproto-0.11.tar.bz2
-resourceproto-1.1.0.tar.bz2
-scrnsaverproto-1.2.0.tar.bz2
-videoproto-2.3.0.tar.bz2
-xcmiscproto-1.2.0.tar.bz2
-xextproto-7.1.1.tar.bz2
-xf86bigfontproto-1.2.0.tar.bz2
-xf86dgaproto-2.1.tar.bz2
-xf86driproto-2.1.0.tar.bz2
-xf86miscproto-0.9.2.tar.bz2
-xf86vidmodeproto-2.3.tar.bz2
-xineramaproto-1.2.tar.bz2
-xproxymanagementprotocol-1.0.2.tar.bz2
-randrproto-1.3.1.tar.bz2
-glproto-1.4.10.tar.bz2
-dri2proto-2.1.tar.bz2
-kbproto-1.0.4.tar.bz2
-xf86miscproto-0.9.3.tar.bz2
-xproxymanagementprotocol-1.0.3.tar.bz2
-dri2proto-2.2.tar.bz2
-glproto-1.4.11.tar.bz2
-dri2proto-2.3.tar.bz2
-glproto-1.4.12.tar.bz2
-renderproto-0.11.1.tar.bz2
-kbproto-1.0.5.tar.bz2
-xextproto-7.1.2.tar.bz2
-videoproto-2.3.1.tar.bz2
-xproto-7.0.19.tar.bz2
-inputproto-2.0.1.tar.bz2
-/bigreqsproto-1.1.0.tar.bz2
-/compositeproto-0.4.1.tar.bz2
-/damageproto-1.2.0.tar.bz2
-/dmxproto-2.3.1.tar.bz2
-/dmxproto-2.3.tar.bz2
-/dri2proto-2.2.tar.bz2
-/dri2proto-2.3.tar.bz2
-/evieext-1.1.0.tar.bz2
-/evieext-1.1.1.tar.bz2
-/fixesproto-4.1.1.tar.bz2
-/fontsproto-2.1.0.tar.bz2
-/glproto-1.4.11.tar.bz2
-/glproto-1.4.12.tar.bz2
-/inputproto-2.0.1.tar.bz2
-/inputproto-2.0.tar.bz2
-/kbproto-1.0.4.tar.bz2
-/kbproto-1.0.5.tar.bz2
-/randrproto-1.3.1.tar.bz2
-/randrproto-1.3.2.tar.bz2
-/recordproto-1.14.1.tar.bz2
-/recordproto-1.14.tar.bz2
-/renderproto-0.11.1.tar.bz2
-/renderproto-0.11.tar.bz2
-/resourceproto-1.1.0.tar.bz2
-/scrnsaverproto-1.2.0.tar.bz2
-/scrnsaverproto-1.2.1.tar.bz2
-/videoproto-2.3.0.tar.bz2
-/videoproto-2.3.1.tar.bz2
-/xcmiscproto-1.2.0.tar.bz2
-/xcmiscproto-1.2.1.tar.bz2
-/xextproto-7.1.1.tar.bz2
-/xextproto-7.1.2.tar.bz2
-/xf86bigfontproto-1.2.0.tar.bz2
-/xf86dgaproto-2.1.tar.bz2
-/xf86driproto-2.1.0.tar.bz2
-/xf86driproto-2.1.1.tar.bz2
-/xf86miscproto-0.9.3.tar.bz2
-/xf86vidmodeproto-2.3.1.tar.bz2
-/xf86vidmodeproto-2.3.tar.bz2
-/xineramaproto-1.2.1.tar.bz2
-/xineramaproto-1.2.tar.bz2
-/xproto-7.0.17.tar.bz2
-/xproto-7.0.19.tar.bz2
-/xproxymanagementprotocol-1.0.3.tar.bz2
-/xextproto-20110224-git9df8b77.tar.bz2
-/randrproto-20110224-git105a161.tar.bz2
-/xextproto-7.2.0.tar.bz2
-/fixesproto-5.0.tar.bz2
-/xproto-7.0.21.tar.bz2
-/resourceproto-1.2.0.tar.bz2
-/inputproto-2.0.2.tar.bz2
-/xproto-7.0.22.tar.bz2
-/dri2proto-2.6.tar.bz2
-/glproto-1.4.14.tar.bz2
-/inputproto-2.1.99.1.tar.bz2
-/inputproto-2.0.99.1.tar.bz2
-/inputproto-2.1.tar.bz2
-/inputproto-2.1.99.4.tar.bz2
-/inputproto-2.1.99.5.tar.bz2
-/glproto-1.4.15.tar.bz2
-/inputproto-2.1.99.6.tar.bz2
-/xproto-7.0.23.tar.bz2
-/glproto-1.4.16.tar.bz2
-/randrproto-1.4.0.tar.bz2
-/dri2proto-2.8.tar.bz2
-/bigreqsproto-1.1.2.tar.bz2
-/compositeproto-0.4.2.tar.bz2
-/damageproto-1.2.1.tar.bz2
-/fontsproto-2.1.2.tar.bz2
-/inputproto-2.2.tar.bz2
-/kbproto-1.0.6.tar.bz2
-/recordproto-1.14.2.tar.bz2
-/scrnsaverproto-1.2.2.tar.bz2
-/xcmiscproto-1.2.2.tar.bz2
-/xextproto-7.2.1.tar.bz2
-/inputproto-2.2.99.1.tar.bz2
-/inputproto-2.3.tar.bz2
-/xproto-7.0.24.tar.bz2
-/presentproto-1.0.tar.bz2
-/dri3proto-1.0.tar.bz2
-/xextproto-7.2.99.901.tar.bz2
-/glproto-1.4.17.tar.bz2
-/fontsproto-2.1.3.tar.bz2
-/videoproto-2.3.2.tar.bz2
-/xextproto-7.3.0.tar.bz2
-/xproto-7.0.26.tar.bz2
-/inputproto-2.3.1.tar.bz2
-/randrproto-1.4.1.tar.bz2
-/randrproto-1.5.0.tar.bz2
-/xproto-7.0.28.tar.bz2
-/videoproto-2.3.3.tar.bz2
-/inputproto-2.3.2.tar.bz2
-/xproto-7.0.31.tar.bz2
-/xorgproto-2018.1.tar.bz2
-/xorgproto-2018.2.tar.bz2
-/xorgproto-2018.3.tar.bz2
-/xorgproto-2018.4.tar.bz2
-/xorgproto-2019.1.tar.bz2
+/xorgproto-*.tar.bz2
diff --git a/sources b/sources
index d0e2b29..cdc5a89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xorgproto-2019.1.tar.bz2) = f26c17f4a027acdc799b532fa65c3ea1b0e8c30794c7b7293060ee9d9dec84b4878966cd2dcda43584849232e73a208abd4213374f89b05c10e5aae92bdc00be
+SHA512 (xorgproto-2021.4.tar.bz2) = 0d905e5f135daf7005e23371cbdc41a62d99567e0a20784e71ead0092ffd1e7582733819f7198add1d97edcc9aa80012ae01d2be8367280d69b41d0c25349367
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index d93fede..e85080e 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -5,8 +5,8 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 2019.1
-Release: 7%{?dist}
+Version: 2021.4
+Release: 1%{?dist}
 License: MIT
 URL: https://www.x.org
 BuildArch: noarch
@@ -92,7 +92,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_includedir}/X11/extensions/XI2proto.h
 %{_includedir}/X11/extensions/XIproto.h
 %{_includedir}/X11/extensions/XKB.h
-%{_includedir}/X11/extensions/XKBgeom.h
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
@@ -151,7 +150,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/syncstr.h
-%{_includedir}/X11/extensions/vldXvMC.h
 %{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
@@ -186,6 +184,7 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_datadir}/pkgconfig/compositeproto.pc
 %{_datadir}/pkgconfig/damageproto.pc
 %{_datadir}/pkgconfig/dmxproto.pc
+%{_datadir}/pkgconfig/dpmsproto.pc
 %{_datadir}/pkgconfig/dri2proto.pc
 %{_datadir}/pkgconfig/dri3proto.pc
 %{_datadir}/pkgconfig/fixesproto.pc
@@ -211,6 +210,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_docdir}/xorgproto/*
 
 %changelog
+* Fri Apr 30 2021 Peter Hutterer <peter.hutterer@redhat.com> 2021.4-1
+- xorgproto 2021.4 (#1954344)
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2019.1-7
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937