diff --git a/.gitignore b/.gitignore
index d96b533..ba0305c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xorgproto-2018.4.tar.bz2
+SOURCES/xorgproto-2020.1.tar.bz2
diff --git a/.xorg-x11-proto-devel.metadata b/.xorg-x11-proto-devel.metadata
index aa6058d..161e4dc 100644
--- a/.xorg-x11-proto-devel.metadata
+++ b/.xorg-x11-proto-devel.metadata
@@ -1 +1 @@
-2e4a3db312e1ce81e15515dfcac52ba0aa5a920c SOURCES/xorgproto-2018.4.tar.bz2
+1cdab4e9ab796760ddb9582071328469a8eca08a SOURCES/xorgproto-2020.1.tar.bz2
diff --git a/SPECS/xorg-x11-proto-devel.spec b/SPECS/xorg-x11-proto-devel.spec
index 3f45589..874b38b 100644
--- a/SPECS/xorg-x11-proto-devel.spec
+++ b/SPECS/xorg-x11-proto-devel.spec
@@ -1,11 +1,13 @@
 %global debug_package %{nil}
 
+# When releasing a xorg-x11-proto-devel version with updated keysyms,
+# rebuild libX11
+
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 2018.4
-Release: 1%{?dist}
+Version: 2020.1
+Release: 3%{?dist}
 License: MIT
-Group: Development/System
 URL: https://www.x.org
 BuildArch: noarch
 
@@ -26,7 +28,7 @@ X.Org X11 Protocol headers
 
 %build
 autoreconf -f -i -v
-%configure --without-xmlto
+%configure --disable-specs
 make %{?_smp_mflags}
 
 
@@ -42,6 +44,14 @@ done
 # keep things building even if you have the html doc tools for xmlto installed
 rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 
+# temporary workaround for 8.3, we need to keep shipping the xf86misc stuff
+# from this package until we rebase libXxf86misc again.
+install -p include/X11/extensions/xf86m* $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+install -p xf86miscproto.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig
+# temporary workaround for 8.3, we need to keep shipping XKBgeom.h
+# from this package until we rebase libX11 again.
+install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+
 %files
 %doc COPYING-*
 %doc *.txt
@@ -55,9 +65,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
-%dir %{_includedir}/X11/PM
-%{_includedir}/X11/PM/PM.h
-%{_includedir}/X11/PM/PMproto.h
 %{_includedir}/X11/Sunkeysym.h
 %{_includedir}/X11/X.h
 %{_includedir}/X11/XF86keysym.h
@@ -92,7 +99,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 +157,7 @@ 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/XKBgeom.h
 %{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
@@ -188,6 +194,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,10 +218,31 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_datadir}/pkgconfig/xf86vidmodeproto.pc
 %{_datadir}/pkgconfig/xineramaproto.pc
 %{_datadir}/pkgconfig/xproto.pc
-%{_datadir}/pkgconfig/xproxymngproto.pc
 %{_docdir}/xorgproto/*
 
 %changelog
+* Mon Jun 08 2020 Peter Hutterer <peter.hutterer@redhat.com> 2020.1-3
+- Ship XKBgeom.h from this package until libX11 is rebased
+
+* Tue Jun 02 2020 Adam Jackson <ajax@redhat.com> - 2020.1-2
+- xorgproto 2020.1
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 20 2019 Peter Hutterer <peter.hutterer@redhat.com> 2019.1-1
+- xorgproto 2019.1
+- drop files for xf86misc and proxy management proto, they're legacy now
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 28 2018 Adam Jackson <ajax@redhat.com> - 2018.4-1
 - xorgproto 2018.4