diff --git a/debian/apertis/copyright b/debian/apertis/copyright
index 73ed02d1c3ed347e4f45e04c5cf9e41c2e56d479..09aea32de5162be37ae98a6b0d912b6b5ad4471f 100644
--- a/debian/apertis/copyright
+++ b/debian/apertis/copyright
@@ -16,7 +16,7 @@ Copyright: 2011, Dave Airlie
  1999, Keith Packard
  1998, Egbert Eich
  1987, 2003-2006, 2008-2010, Oracle and/or its affiliates.
-License: MIT
+License: Expat and/or HPND-sell-variant and/or MIT-Open-Group and/or X11 or MIT
 
 Files: .appveyor.yml
  .dir-locals.el
@@ -28,10 +28,6 @@ Files: .appveyor.yml
  autogen.sh
  devbook.am
  docbook.am
- fix-miregion
- fix-miregion-private
- fix-patch-whitespace
- fix-region
  manpages.am
  meson.build
  meson_options.txt
@@ -49,8 +45,7 @@ Copyright: 1994-1996, 1999-2002, 2004-2011, Free Software Foundation
 License: FSFAP
 
 Files: Makefile.in
- aclocal.m4
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: Xext/*
@@ -58,7 +53,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: Xext/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: Xext/bigreq.c
@@ -70,8 +65,8 @@ Files: Xext/bigreq.c
  Xext/syncsrv.h
  Xext/xcmisc.c
  Xext/xtest.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: Xext/dpms.c
  Xext/panoramiX.c
@@ -88,23 +83,23 @@ License: MIT
 
 Files: Xext/geext.h
 Copyright: 2007, Peter Hutterer <peter@cs.unisa.edu.au>
-License: MIT
+License: MIT-Open-Group
 
 Files: Xext/saver.c
 Copyright: 1992-1995, X Consortium
-License: Expat
+License: X11
 
 Files: Xext/shmint.h
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: Xext/sleepuntil.h
 Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: Xext/sync.c
-Copyright: 1987, 1991, 1993, 1998, The Open Group
-License: NTP~disclaimer
+Copyright: 1991, 1993, 1998, The Open Group
+License: MIT-Open-Group and/or NTP~disclaimer
 
 Files: Xext/syncsdk.h
 Copyright: 2009, 2010, 2015, NVIDIA Corporation
@@ -138,8 +133,8 @@ Copyright: 1991, Digital Equipment Corporation, Maynard, Massachusetts
 License: MIT
 
 Files: Xi/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: Xi/Makefile.am
  Xi/meson.build
@@ -148,7 +143,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: Xi/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: Xi/allowev.h
@@ -204,12 +199,12 @@ Files: Xi/xiallowev.c
  Xi/xiselectev.h
  Xi/xisetdevfocus.c
  Xi/xisetdevfocus.h
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: Xi/xibarriers.c
-Copyright: 2005, 2012, Red Hat, Inc.
-License: NTP~disclaimer
+Copyright: 2012, Red Hat, Inc.
+License: HPND-sell-variant
 
 Files: Xi/xichangecursor.c
  Xi/xichangecursor.h
@@ -236,17 +231,21 @@ Copyright: 2008, Peter Hutterer
  2006, Keith Packard
 License: MIT
 
+Files: aclocal.m4
+Copyright: 1996-2021, Free Software Foundation, Inc.
+License: FSFULLR and/or MIT-Open-Group
+
 Files: compile
  depcomp
  missing
  test-driver
  ylwrap
-Copyright: 1996-2020, Free Software Foundation, Inc.
+Copyright: 1996-2021, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf-data exception
 
 Files: composite/*
 Copyright: 2006, Oracle and/or its affiliates.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: composite/Makefile.am
  composite/meson.build
@@ -254,7 +253,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: composite/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: composite/compositeext.h
@@ -266,7 +265,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: config/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: config/config-backends.h
@@ -278,7 +277,7 @@ License: MIT
 Files: config/fdi2iclass.py
 Copyright: 2010, Dan Nicholson
  2009, Canonical Ltd.
-License: Expat
+License: MIT
 
 Files: config/hal.c
 Copyright: 2007, Red Hat, Inc.
@@ -294,7 +293,7 @@ Copyright: 2011, Matthieu Herrb
 License: MIT
 
 Files: configure
-Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
+Copyright: 1992-1996, 1998-2017, 2020, 2021, Free Software Foundation
 License: FSFUL
 
 Files: configure.ac
@@ -306,18 +305,18 @@ Copyright: no-info-found
 License: MIT
 
 Files: damageext/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: damageext/damageext.c
-Copyright: 2008, 2013, Red Hat, Inc.
- 2002, 2006, Keith Packard
-License: NTP~disclaimer
+Copyright: 2013, Red Hat, Inc.
+ 2002, Keith Packard
+License: HPND-sell-variant
 
 Files: damageext/damageext.h
  damageext/damageextint.h
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: dbe/*
 Copyright: 1994, 1995, Hewlett-Packard Company
@@ -329,7 +328,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: dbe/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: debian/*
@@ -344,24 +343,26 @@ Files: debian/local/xvfb-run.1
 Copyright: 1998-2004, Branden Robinson <branden@debian.org>.
 License: GPL-2+
 
+Files: debian/patches/02_kbsd-input-devd.diff
+Copyright: 2014, Robert Millan
+ 2012, Baptiste Daroussin
+License: MIT
+
 Files: debian/xserver-xorg-legacy.config
-Copyright: -2003, Branden Robinson.
+Copyright: no-info-found
 License: GPL-2
 
 Files: debian/xserver-xorg-legacy.postinst
  debian/xserver-xorg-legacy.postrm
-Copyright: -2001, 2003, Branden Robinson.
+Copyright: no-info-found
 License: GPL-2
 
 Files: dix/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: dix/BuiltInAtoms
-Copyright: of the character shapes
-License: MIT
-
-Files: dix/Makefile.am
+ dix/Makefile.am
  dix/buildatoms
  dix/initatoms.c
  dix/meson.build
@@ -371,14 +372,9 @@ Copyright: no-info-found
 License: MIT
 
 Files: dix/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: dix/Xserver-dtrace.h.in
- dix/Xserver.d
-Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
-License: MIT
-
 Files: dix/dispatch.h
 Copyright: 1996, Thomas E. Dickey <dickey@clark.net>
 License: MIT
@@ -390,8 +386,13 @@ License: MIT
 Files: dix/enterleave.c
  dix/enterleave.h
  dix/eventconvert.c
- dix/window.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
+License: MIT
+
+Files: dix/gestures.c
+Copyright: 2020, Povilas Kanapickas <povilas@radix.lt>
+ 2011, Red Hat, Inc.
+ 2011, Collabra Ltd.
 License: MIT
 
 Files: dix/getevents.c
@@ -406,15 +407,15 @@ Copyright: 2006-2008, 2011, Daniel Stone
 License: MIT
 
 Files: dix/privates.c
-Copyright: 1987, 1991, 1993, 1998, The Open Group
-License: NTP~disclaimer
+Copyright: 1987, 1993, 1998, The Open Group
+License: HPND-sell-variant and/or MIT-Open-Group and/or NTP~disclaimer
 
 Files: dix/ptrveloc.c
 Copyright: 2006-2011, Simon Thum simon dot thum at gmx dot de
 License: MIT
 
 Files: dix/stubmain.c
-Copyright: 2012, 2014, Jon TURNEY
+Copyright: 2009, 2011-2014, Jon TURNEY
 License: MIT
 
 Files: dix/touch.c
@@ -422,25 +423,29 @@ Copyright: 2011, Red Hat, Inc.
  2011, Collabra Ltd.
 License: MIT
 
+Files: dix/window.c
+Copyright: 2006, 2014, Red Hat, Inc.
+License: MIT-Open-Group
+
 Files: doc/*
 Copyright: no-info-found
 License: MIT
 
 Files: doc/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: doc/Xinput.xml
 Copyright: 1989-1991, X Consortium</para>
-License: NTP
+License: NTP and/or X11
 
 Files: doc/dtrace/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: dri3/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: dri3/Makefile.am
  dri3/meson.build
@@ -448,7 +453,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: dri3/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: exa/*
@@ -461,24 +466,24 @@ Copyright: no-info-found
 License: MIT
 
 Files: exa/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: exa/exa.c
  exa/exa_accel.c
  exa/exa_render.c
-Copyright: The XFree86 Project Inc. / 2001, Keith Packard
-License: NTP~disclaimer
+Copyright: The XFree86 Project Inc.
+ 2001, Keith Packard
+License: HPND-sell-variant
 
 Files: exa/exa.h
- exa/exa_unaccel.c
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: exa/exa_glyphs.c
 Copyright: 2007, 2008, Red Hat, Inc.
  2000, SuSE, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: exa/exa_migration_classic.c
 Copyright: 2006-2009, 2011, 2013, 2014, Intel Corporation
@@ -486,15 +491,19 @@ License: MIT
 
 Files: exa/exa_offscreen.c
 Copyright: 2003, Anders Carlsson
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: exa/exa_priv.h
 Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
+
+Files: exa/exa_unaccel.c
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: fb/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: fb/Makefile.am
  fb/meson.build
@@ -503,7 +512,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: fb/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: fb/fbcmap_mi.c
@@ -513,20 +522,20 @@ License: MIT
 Files: fb/fboverlay.c
  fb/fboverlay.h
 Copyright: 2000, SuSE, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: fb/fbpict.c
 Copyright: 2007, 2008, Red Hat, Inc.
  2000, SuSE, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: fb/fbpict.h
 Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: glamor/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: glamor/Makefile.am
  glamor/glamor_largepixmap.c
@@ -535,7 +544,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: glamor/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: glamor/glamor.c
@@ -570,7 +579,7 @@ Copyright: 2010, Intel Corporation.
 License: MIT
 
 Files: glamor/glamor_egl.h
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: glamor/glamor_egl_ext.h
@@ -590,7 +599,7 @@ License: MIT
 Files: glamor/glamor_window.c
 Copyright: 2008, Intel Corporation
  1998, Keith Packard
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: glamor/glamor_xv.c
 Copyright: 2013, Red Hat
@@ -607,7 +616,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: glx/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: glx/clientinfo.c
@@ -617,50 +626,38 @@ License: MIT
 
 Files: glx/extension_string.c
  glx/extension_string.h
-Copyright: IBM Corporation 2002-2006
-License: MIT
-
-Files: glx/glxbyteorder.h
-Copyright: IBM Corporation 2006, 2007
-License: MIT
-
-Files: glx/glxdri2.c
- glx/glxdricommon.c
- glx/glxdricommon.h
-Copyright: 2007, 2008, Red Hat, Inc
-License: NTP~disclaimer
-
-Files: glx/glxdriswrast.c
-Copyright: 2008, Red Hat, Inc
- 2008, George Sapountzis <gsap7@yahoo.gr>
-License: NTP~disclaimer
-
-Files: glx/indirect_dispatch.c
+ glx/glxbyteorder.h
+ glx/indirect_dispatch.c
  glx/indirect_dispatch.h
  glx/indirect_dispatch_swap.c
+ glx/indirect_program.c
  glx/indirect_reqsize.c
  glx/indirect_reqsize.h
- glx/indirect_util.c
- glx/indirect_util.h
-Copyright: IBM Corporation 2005
-License: MIT
-
-Files: glx/indirect_program.c
+ glx/indirect_size.h
+ glx/indirect_size_get.c
+ glx/indirect_size_get.h
  glx/indirect_table.c
  glx/indirect_table.h
  glx/indirect_texture_compression.c
-Copyright: IBM Corporation 2005, 2006
+ glx/indirect_util.c
+ glx/indirect_util.h
+ glx/swap_interval.c
+Copyright: 2002-2007, IBM Corporation
 License: MIT
 
-Files: glx/indirect_size.h
- glx/indirect_size_get.c
- glx/indirect_size_get.h
-Copyright: IBM Corporation 2004
-License: MIT
+Files: glx/glxdri2.c
+Copyright: 2007, Red Hat, Inc
+License: HPND-sell-variant
 
-Files: glx/swap_interval.c
-Copyright: IBM Corporation 2006
-License: MIT
+Files: glx/glxdricommon.c
+ glx/glxdricommon.h
+Copyright: 2008, Red Hat, Inc
+License: HPND-sell-variant and/or NTP~disclaimer
+
+Files: glx/glxdriswrast.c
+Copyright: 2008, Red Hat, Inc
+ 2008, George Sapountzis <gsap7@yahoo.gr>
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: glx/vndcmds.c
  glx/vndext.c
@@ -676,196 +673,11 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/*
-Copyright: 2001-2004, Red Hat Inc., Durham, North Carolina.
-License: MIT
-
-Files: hw/dmx/Makefile.am
- hw/dmx/meson.build
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/config/*
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/config/Canvas.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
-
-Files: hw/dmx/config/Canvas.h
- hw/dmx/config/CanvasP.h
-Copyright: 2002, Red Hat Inc., Durham, North Carolina.
- 1987, 1998, The Open Group
-License: MIT
-
-Files: hw/dmx/config/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/config/dmxcompat.c
- hw/dmx/config/dmxcompat.h
- hw/dmx/config/dmxconfig.c
- hw/dmx/config/dmxconfig.h
- hw/dmx/config/dmxparse.c
- hw/dmx/config/dmxparse.h
- hw/dmx/config/dmxprint.c
- hw/dmx/config/dmxprint.h
- hw/dmx/config/dmxtodmx.c
- hw/dmx/config/parser.y
- hw/dmx/config/scanner.l
- hw/dmx/config/vdltodmx.c
- hw/dmx/config/xdmxconfig.c
-Copyright: 2001-2004, Red Hat Inc., Durham, North Carolina.
-License: MIT
-
-Files: hw/dmx/config/man/*
-Copyright: 2001-2004, Red Hat Inc., Durham, North Carolina.
-License: MIT
-
-Files: hw/dmx/config/man/Makefile.am
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/config/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/config/parser.c
- hw/dmx/config/parser.h
-Copyright: 1984, 1989, 1990, 2000-2015, 2018-2020, Free Software Foundation
-License: GPL-3+ WITH Bison-exception-2.2
-
-Files: hw/dmx/dmx-config.h
- hw/dmx/dmxinit.h
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
-License: MIT
-
-Files: hw/dmx/dmx_glxvisuals.c
- hw/dmx/dmx_glxvisuals.h
-Copyright: 1991-2000, Silicon Graphics, Inc.
-License: SGI-B-2.0
-
-Files: hw/dmx/dmxclient.h
-Copyright: 2004, Red Hat Inc., Durham, North Carolina.
- 1995, X Consortium
-License: Expat
-
-Files: hw/dmx/doc/*
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
-License: MIT
-
-Files: hw/dmx/doc/Makefile.am
-Copyright: 2005, 2012, Red Hat, Inc.
-License: NTP~disclaimer
-
-Files: hw/dmx/doc/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: NTP~disclaimer
-
-Files: hw/dmx/doc/dmx.xml
-Copyright: 2001-2004, Red Hat, Inc., Raleigh, North Carolina</emphasis>
- 2001, VA
-License: MIT
-
-Files: hw/dmx/doc/scaled.xml
-Copyright: 2003, Red Hat, Inc., Raleigh, North Carolina</emphasis>
-License: MIT
-
-Files: hw/dmx/doxygen/*
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/doxygen/Makefile.am
-Copyright: 2005, 2012, Red Hat, Inc.
-License: NTP~disclaimer
-
-Files: hw/dmx/doxygen/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: NTP~disclaimer
-
-Files: hw/dmx/examples/Makefile.am
- hw/dmx/examples/meson.build
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/examples/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/examples/dmxwininfo.c
-Copyright: 2003, the XFree86 Project, Inc.
-License: MIT
-
-Files: hw/dmx/glxProxy/*
-Copyright: 1991-2000, Silicon Graphics, Inc.
-License: SGI-B-2.0
-
-Files: hw/dmx/glxProxy/Makefile.am
- hw/dmx/glxProxy/meson.build
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/glxProxy/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/glxProxy/compsize.h
- hw/dmx/glxProxy/glxcmds.h
-Copyright: 2011, Apple Inc.
-License: MIT
-
-Files: hw/dmx/glxProxy/glxswap.c
- hw/dmx/glxProxy/glxswap.h
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
-License: MIT
-
-Files: hw/dmx/input/ChkNotMaskEv.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
-
-Files: hw/dmx/input/Makefile.am
- hw/dmx/input/meson.build
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/input/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/dmx/input/atKeynames.h
-Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
-License: Expat and/or NTP~disclaimer
-
-Files: hw/dmx/input/dmxdetach.c
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
-License: MIT
-
-Files: hw/dmx/input/usb-keyboard.c
-Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
-License: NTP~disclaimer
-
-Files: hw/dmx/man/*
-Copyright: no-info-found
-License: MIT
-
-Files: hw/dmx/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: hw/dmx/man/Xdmx.man
-Copyright: 2001-2004, Red Hat Inc., Durham, North Carolina.
-License: MIT
-
 Files: hw/kdrive/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/kdrive/ephyr/Makefile.am
@@ -877,7 +689,7 @@ Copyright: 2006-2009, 2011, 2013, 2014, Intel Corporation
 License: MIT
 
 Files: hw/kdrive/ephyr/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/kdrive/ephyr/ephyr.c
@@ -886,19 +698,19 @@ Files: hw/kdrive/ephyr/ephyr.c
  hw/kdrive/ephyr/hostx.c
  hw/kdrive/ephyr/hostx.h
 Copyright: 2004, Nokia
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/kdrive/ephyr/ephyrcursor.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: hw/kdrive/ephyr/ephyrlog.h
  hw/kdrive/ephyr/ephyrvideo.c
 Copyright: 2007, OpenedHand Ltd
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/kdrive/ephyr/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/kdrive/ephyr/man/Xephyr.man
@@ -906,48 +718,48 @@ Copyright: Matthieu Herrb <matthieu@herrb.eu>
 License: ISC
 
 Files: hw/kdrive/src/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: hw/kdrive/src/Makefile.am
- hw/kdrive/src/fourcc.h
  hw/kdrive/src/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: hw/kdrive/src/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/kdrive/src/kinput.c
 Copyright: 2006, Nokia Corporation
  1999, Keith Packard
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/kdrive/src/kxv.c
  hw/kdrive/src/kxv.h
-Copyright: 2000-2001, - Nokia Home Communications / 1998-1999, - The XFree86 Project Inc.
+Copyright: 2000, 2001, Nokia Home Communications
+ 1998, 1999, The XFree86 Project Inc.
 License: ICU
 
 Files: hw/vfb/InitInput.c
  hw/vfb/InitOutput.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: hw/vfb/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/vfb/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/vfb/man/Xvfb.man
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: hw/xfree86/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/common/*
@@ -960,20 +772,18 @@ Files: hw/xfree86/common/Makefile.am
  hw/xfree86/common/meson.build
  hw/xfree86/common/vesamodes
  hw/xfree86/common/xaarop.h
- hw/xfree86/common/xf86Build.h.in
- hw/xfree86/common/xf86Build.sh
  hw/xfree86/common/xorgHelper.c
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/common/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/common/compiler.h
  hw/xfree86/common/xf86Events.c
 Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
-License: Expat and/or NTP~disclaimer
+License: Expat and/or HPND-sell-variant
 
 Files: hw/xfree86/common/modeline2c.awk
 Copyright: 2007, Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -985,12 +795,14 @@ Copyright: 2003, X-Oz Technologies.
 License: Expat
 
 Files: hw/xfree86/common/xf86Config.c
-Copyright: Copyright 1990,91Thomas Roell, Dinkelscherben, Germany. / 1997, Metro Link, Inc. / 1992-2003, The XFree86 Project, Inc.
+Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
+ 1997, Metro Link, Inc.
+ 1992-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xfree86/common/xf86Configure.c
 Copyright: 2000-2002, Alan Hourihane, Flint Mountain, North Wales.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/common/xf86DGA.c
 Copyright: 1998-2002, The XFree86 Project, Inc.
@@ -1004,7 +816,8 @@ Copyright: 2006-2008, 2011, Daniel Stone
 License: MIT
 
 Files: hw/xfree86/common/xf86Init.c
-Copyright: Copyright 1990,91Thomas Roell, Dinkelscherben, Germany. / 1992-2003, The XFree86 Project, Inc.
+Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
+ 1992-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xfree86/common/xf86MatchDrivers.h
@@ -1013,15 +826,15 @@ License: MIT
 
 Files: hw/xfree86/common/xf86Mode.c
 Copyright: 1997-2003, The XFree86 Project, Inc.
-License: Expat and/or NTP~disclaimer
+License: Expat and/or HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/common/xf86Optionstr.h
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: hw/xfree86/common/xf86RandR.c
 Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/common/xf86VGAarbiter.c
 Copyright: 2007, Paulo R. Zanoni, Tiago Vignatti
@@ -1035,7 +848,7 @@ License: Expat
 Files: hw/xfree86/common/xf86Xinput.c
  hw/xfree86/common/xf86Xinput.h
 Copyright: 1995-1999, Frederic Lepied, France. <Lepied@XFree86.org>
-License: Expat and/or NTP~disclaimer
+License: Expat and/or HPND-sell-variant
 
 Files: hw/xfree86/common/xf86platformBus.c
  hw/xfree86/common/xf86platformBus.h
@@ -1057,7 +870,7 @@ Copyright: 2004, X.Org Foundation
 License: Expat
 
 Files: hw/xfree86/ddc/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/ddc/ddc.c
@@ -1077,7 +890,7 @@ Copyright: 2007, Red Hat, Inc.
 License: MIT
 
 Files: hw/xfree86/dixmods/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/dixmods/fbmodule.c
@@ -1089,11 +902,11 @@ Copyright: 1998, 1999, Precision Insight, Inc., Cedar Park, Texas.
 License: MIT
 
 Files: hw/xfree86/dixmods/shmodule.c
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: hw/xfree86/doc/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/dri/*
@@ -1107,7 +920,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/dri/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/dri/dri.h
@@ -1116,37 +929,50 @@ Copyright: 1998, 1999, Precision Insight, Inc., Cedar Park, Texas.
 License: MIT
 
 Files: hw/xfree86/dri2/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/dri2/dri2.c
  hw/xfree86/dri2/dri2.h
  hw/xfree86/dri2/dri2ext.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
-License: MIT
+Copyright: 2007, 2008, Red Hat, Inc.
+License: ICU
 
 Files: hw/xfree86/dri2/dri2int.h
 Copyright: 2006-2008, 2011, Daniel Stone
 License: MIT
 
 Files: hw/xfree86/dri2/pci_ids/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/drivers/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: hw/xfree86/drivers/modesetting/*
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Files: hw/xfree86/drivers/inputtest/Makefile.am
+Copyright: 2005, Adam Jackson.
 License: MIT
 
+Files: hw/xfree86/drivers/inputtest/Makefile.in
+Copyright: 1994-2021, Free Software Foundation, Inc.
+License: FSFULLR
+
+Files: hw/xfree86/drivers/inputtest/xf86-input-inputtest-protocol.h
+Copyright: 2020, Povilas Kanapickas <povilas@radix.lt>
+License: HPND-sell-variant
+
+Files: hw/xfree86/drivers/inputtest/xf86-input-inputtest.c
+Copyright: 2020, Povilas Kanapickas <povilas@radix.lt>
+ 2013-2017, Red Hat, Inc.
+License: HPND-sell-variant
+
 Files: hw/xfree86/drivers/modesetting/Makefile.am
 Copyright: 2005, Adam Jackson.
 License: MIT
 
 Files: hw/xfree86/drivers/modesetting/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/drivers/modesetting/dri2.c
@@ -1155,30 +981,38 @@ Copyright: 2014, Broadcom
 License: MIT
 
 Files: hw/xfree86/drivers/modesetting/driver.c
-Copyright: 2011, Dave Airlie
+Copyright: 2019, NVIDIA CORPORATION
+ 2011, Dave Airlie
  2008, Tungsten Graphics, Inc., Cedar Park, Texas.
 License: MIT
 
 Files: hw/xfree86/drivers/modesetting/driver.h
-Copyright: 2008, Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright: 2019, NVIDIA CORPORATION
+ 2008, Tungsten Graphics, Inc., Cedar Park, Texas.
 License: MIT
 
-Files: hw/xfree86/drivers/modesetting/meson.build
- hw/xfree86/drivers/modesetting/modesetting.man
-Copyright: no-info-found
+Files: hw/xfree86/drivers/modesetting/drmmode_display.c
+ hw/xfree86/drivers/modesetting/drmmode_display.h
+Copyright: 2019, NVIDIA CORPORATION
+ 2007, Red Hat, Inc.
+License: MIT
+
+Files: hw/xfree86/drivers/modesetting/dumb_bo.c
+ hw/xfree86/drivers/modesetting/dumb_bo.h
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: hw/xfree86/drivers/modesetting/pageflip.c
  hw/xfree86/drivers/modesetting/present.c
-Copyright: 2011-2014, Intel Corporation
-License: NTP~disclaimer
+Copyright: 2014, Intel Corporation
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/drivers/modesetting/vblank.c
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/exa/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/exa/examodule.c
@@ -1186,15 +1020,15 @@ Copyright: 2006-2009, 2011, 2013, 2014, Intel Corporation
 License: MIT
 
 Files: hw/xfree86/exa/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/fbdevhw/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/fbdevhw/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/glamor_egl/Makefile.am
@@ -1202,7 +1036,7 @@ Copyright: 2006-2009, 2011, 2013, 2014, Intel Corporation
 License: MIT
 
 Files: hw/xfree86/glamor_egl/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/glamor_egl/glamor_xf86_xv.c
@@ -1210,7 +1044,7 @@ Copyright: 2013, Red Hat
 License: MIT
 
 Files: hw/xfree86/i2c/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/i2c/xf86i2c.c
@@ -1234,12 +1068,23 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/int10/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
+Files: hw/xfree86/int10/vbe.c
+ hw/xfree86/int10/vbe.h
+Copyright: 2000, Egbert Eich
+ 2000, Conectiva S.A. (http://www.conectiva.com)
+License: MIT
+
+Files: hw/xfree86/int10/vbeModes.c
+ hw/xfree86/int10/vbeModes.h
+Copyright: 2002, David Dawes
+License: Expat
+
 Files: hw/xfree86/loader/*
 Copyright: 1995-1998, Metro Link, Inc.
-License: Expat and/or NTP~disclaimer
+License: Expat and/or HPND-sell-variant
 
 Files: hw/xfree86/loader/Makefile.am
  hw/xfree86/loader/meson.build
@@ -1247,29 +1092,30 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/loader/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/loader/symbol-test.c
-Copyright: 2016, 2017, Broadcom
+Copyright: 2016-2018, Broadcom
 License: MIT
 
 Files: hw/xfree86/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/man/Xorg.man
-Copyright: software, provided under licenses that permit modification / numerous authors and
+Copyright: software, provided under licenses that permit modification
+ numerous authors and
 License: MIT
 
 Files: hw/xfree86/man/Xorg.wrap.man
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
-License: MIT
+Copyright: 2006, 2014, Red Hat, Inc.
+License: MIT-Open-Group
 
 Files: hw/xfree86/modes/*
 Copyright: 2010, 2011, Aaron Plattner
  2006, 2007, Keith Packard
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/modes/Makefile.am
  hw/xfree86/modes/meson.build
@@ -1277,18 +1123,18 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/modes/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/modes/xf86Crtc.c
-Copyright: 2008, 2013, Red Hat, Inc.
- 2002, 2006, Keith Packard
-License: NTP~disclaimer
+Copyright: 2008, Red Hat, Inc.
+ 2006, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/modes/xf86DiDGA.c
  hw/xfree86/modes/xf86RandR12.h
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/modes/xf86EdidModes.c
 Copyright: 2008, Red Hat, Inc.
@@ -1304,28 +1150,23 @@ Copyright: 2006-2009, 2011, 2013, 2014, Intel Corporation
 License: MIT
 
 Files: hw/xfree86/modes/xf86RandR12.c
-Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
-
-Files: hw/xfree86/modes/xf86cvt.c
-Copyright: 2005, 2006, Luc Verhaegen.
-License: Expat
+Copyright: 2002, Keith Packard, member of The XFree86 Project, Inc.
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/modes/xf86gtf.c
 Copyright: 2001, Andy Ritger aritger@nvidia.com
 License: BSD-3-clause
 
 Files: hw/xfree86/os-support/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/bsd/*
 Copyright: 1993, David Wexelblat <dwex@goblin.org>
  1992, Rich Murphey <Rich@Rice.edu>
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/os-support/bsd/Makefile.am
- hw/xfree86/os-support/bsd/bsd_apm.c
  hw/xfree86/os-support/bsd/bsd_ev56.c
  hw/xfree86/os-support/bsd/bsd_kmod.c
  hw/xfree86/os-support/bsd/memrange.h
@@ -1333,34 +1174,30 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/os-support/bsd/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/bsd/bsd_VTsw.c
 Copyright: 1993, David Wexelblat <dwex@goblin.org>
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/os-support/bsd/bsd_bell.c
 Copyright: 1993, David Dawes <dawes@xfree86.org>
  1992, Rich Murphey <Rich@Rice.edu>
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
-Files: hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
-Copyright: 1993-2003, The XFree86 Project, Inc.
-License: Expat
+Files: hw/xfree86/os-support/bus/Makefile.in
+Copyright: 1994-2021, Free Software Foundation, Inc.
+License: FSFULLR
 
-Files: hw/xfree86/os-support/bus/*
+Files: hw/xfree86/os-support/bus/Pci.c
 Copyright: 1998, Concurrent Computer Corporation
-License: NTP~disclaimer
+License: BSD-3-clause and/or Expat and/or HPND-sell-variant and/or NTP
 
-Files: hw/xfree86/os-support/bus/Makefile.am
- hw/xfree86/os-support/bus/nobus.c
-Copyright: no-info-found
-License: MIT
-
-Files: hw/xfree86/os-support/bus/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
+Files: hw/xfree86/os-support/bus/Pci.h
+ hw/xfree86/os-support/bus/xf86Pci.h
+Copyright: 1998, Concurrent Computer Corporation
+License: Expat and/or HPND-sell-variant and/or NTP
 
 Files: hw/xfree86/os-support/bus/Sbus.c
  hw/xfree86/os-support/bus/xf86Sbus.h
@@ -1373,14 +1210,14 @@ License: MIT
 
 Files: hw/xfree86/os-support/hurd/*
 Copyright: 1997, 1998, UCHIYAMA Yasushi
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/os-support/hurd/Makefile.am
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/os-support/hurd/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/hurd/hurd_bell.c
@@ -1393,7 +1230,7 @@ Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xfree86/os-support/linux/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/linux/int10/linux.c
@@ -1401,7 +1238,7 @@ Copyright: 1999-2004, 2008, Egbert Eich
 License: MIT
 
 Files: hw/xfree86/os-support/linux/linux.h
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: hw/xfree86/os-support/linux/lnx_agp.c
@@ -1417,14 +1254,14 @@ Files: hw/xfree86/os-support/linux/lnx_init.c
  hw/xfree86/os-support/linux/lnx_video.c
 Copyright: 1993, David Wexelblat <dwex@goblin.org>
  1992, Orest Zborowski <obz@Kodak.com>
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/os-support/linux/systemd-logind.c
-Copyright: 2013, 2017, Red Hat Inc.
+Copyright: 2013, Red Hat Inc.
 License: MIT
 
 Files: hw/xfree86/os-support/misc/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/shared/*
@@ -1435,7 +1272,7 @@ Files: hw/xfree86/os-support/shared/VTsw_noop.c
  hw/xfree86/os-support/shared/VTsw_usl.c
  hw/xfree86/os-support/shared/ioperm_noop.c
 Copyright: 1993, David Wexelblat <dwex@XFree86.org>
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/os-support/shared/platform_noop.c
 Copyright: no-info-found
@@ -1454,7 +1291,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/os-support/solaris/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/solaris/sun_agp.c
@@ -1473,10 +1310,10 @@ Files: hw/xfree86/os-support/solaris/sun_init.c
 Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany
  1999, David Holland <davidh@iquest.net>
  1993, David Wexelblat <dwex@goblin.org>
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/os-support/stub/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/os-support/xf86_OSlib.h
@@ -1491,7 +1328,7 @@ Copyright: 1997, Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
  1992, Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
  1992, David Dawes <dawes@XFree86.org>
  1990, 1991, Thomas Roell, Dinkelscherben, Germany
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/os-support/xf86_OSproc.h
 Copyright: 1994-2003, The XFree86 Project, Inc
@@ -1504,7 +1341,7 @@ Copyright: 1994-2003, The XFree86 Project, Inc
  1992, Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
  1992, David Dawes <dawes@XFree86.org>
  1990, 1991, Thomas Roell, Dinkelscherben, Germany
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: hw/xfree86/parser/*
 Copyright: 1997, Metro Link Incorporated
@@ -1515,7 +1352,7 @@ Copyright: 1998, 1999, Precision Insight, Inc., Cedar Park, Texas.
 License: MIT
 
 Files: hw/xfree86/parser/Extensions.c
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
+Copyright: 2004, 2005, Red Hat Inc., Raleigh, North Carolina.
 License: MIT
 
 Files: hw/xfree86/parser/InputClass.c
@@ -1528,7 +1365,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/parser/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/parser/OutputClass.c
@@ -1539,41 +1376,20 @@ Files: hw/xfree86/parser/configProcs.h
 Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
-Files: hw/xfree86/ramdac/BT.c
- hw/xfree86/ramdac/IBM.c
- hw/xfree86/ramdac/TI.c
- hw/xfree86/ramdac/xf86RamDac.c
- hw/xfree86/ramdac/xf86RamDacCmap.c
-Copyright: 1998, Alan Hourihane, Wigan, England.
-License: NTP~disclaimer
-
 Files: hw/xfree86/ramdac/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/shadowfb/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/shadowfb/shadowfb.c
-Copyright: 2014, Red Hat, Inc.
- 1999
+Copyright: 2014, Red Hat, Inc. / 1999
 License: MIT
 
 Files: hw/xfree86/utils/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/xfree86/utils/cvt/*
-Copyright: 2005, 2006, Luc Verhaegen.
-License: Expat
-
-Files: hw/xfree86/utils/cvt/Makefile.am
-Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
-License: MIT
-
-Files: hw/xfree86/utils/cvt/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/utils/gtf/*
@@ -1585,38 +1401,21 @@ Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
 License: MIT
 
 Files: hw/xfree86/utils/gtf/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/utils/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: hw/xfree86/vbe/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/xfree86/vbe/vbe.c
- hw/xfree86/vbe/vbe.h
-Copyright: 2000, Egbert Eich
- 2000, Conectiva S.A. (http:www.conectiva.com)
-License: MIT
-
-Files: hw/xfree86/vbe/vbeModes.c
- hw/xfree86/vbe/vbeModes.h
-Copyright: 2002, David Dawes
-License: Expat
-
 Files: hw/xfree86/vgahw/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/vgahw/vgaHW.c
-Copyright: Copyright 1990,91Thomas Roell, Dinkelscherben, Germany. / 1991-1999, The XFree86 Project, Inc.
-License: MIT
-
-Files: hw/xfree86/vgahw/vgaHW.h
-Copyright: Copyright 1990,91Thomas Roell, Dinkelscherben, Germany. / 1997-1998, The XFree86 Project, Inc.
+ hw/xfree86/vgahw/vgaHW.h
+Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
+ 1991-1999, The XFree86 Project, Inc.
 License: MIT
 
 Files: hw/xfree86/vgahw/vgaHWmodule.c
@@ -1624,8 +1423,10 @@ Copyright: 1998, The XFree86 Project, Inc
 License: MIT
 
 Files: hw/xfree86/x86emu/*
-Copyright: David Mosberger-Tang / 1999, Egbert Eich / 1996-1999, SciTech Software, Inc.
-License: NTP~disclaimer
+Copyright: David Mosberger-Tang
+ 1999, Egbert Eich
+ 1996-1999, SciTech Software, Inc.
+License: HPND-sell-variant
 
 Files: hw/xfree86/x86emu/Makefile.am
  hw/xfree86/x86emu/meson.build
@@ -1633,15 +1434,15 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xfree86/x86emu/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
 Copyright: 2008, Bart Trojanowski, Symbio Technologies, LLC
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xfree86/xkb/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xfree86/xkb/xkbKillSrv.c
@@ -1650,7 +1451,7 @@ Copyright: 1993-1996, Silicon Graphics Computer Systems, Inc.
 License: MIT
 
 Files: hw/xfree86/xorg-wrapper.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: hw/xfree86/xorgconf.cpp
@@ -1659,7 +1460,7 @@ License: Expat
 
 Files: hw/xnest/*
 Copyright: 1993, Davor Matic
-License: NTP
+License: MIT-Open-Group and/or NTP
 
 Files: hw/xnest/Makefile.am
  hw/xnest/icon
@@ -1669,27 +1470,27 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xnest/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xnest/Xnest.h
 Copyright: 1992-1995, X Consortium
-License: Expat
+License: X11
 
 Files: hw/xnest/man/*
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xnest/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xnest/man/Xnest.man
 Copyright: 1992-1995, X Consortium
-License: Expat
+License: X11
 
 Files: hw/xnest/xnest-config.h
-Copyright: 2002-2005, Red Hat Inc., Raleigh, North Carolina.
+Copyright: 2004, 2005, Red Hat Inc., Raleigh, North Carolina.
 License: MIT
 
 Files: hw/xquartz/GL/*
@@ -1697,30 +1498,36 @@ Copyright: 2002-2012, 2021, Apple Inc.
 License: Expat
 
 Files: hw/xquartz/GL/Makefile.am
+ hw/xquartz/GL/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/GL/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/GL/glcontextmodes.c
  hw/xquartz/GL/glcontextmodes.h
-Copyright: IBM Corporation 2003
+Copyright: 2002-2007, IBM Corporation
 License: MIT
 
 Files: hw/xquartz/GL/indirect.c
-Copyright: Copyright 1998-1999, Precision Insight, Inc., Cedar Park, Texas. / 2007-2012, Apple Inc. / 2004, Torrey T. Lyons. / 2002, Greg Parker.
-License: Expat
-
-Files: hw/xquartz/GL/visualConfigs.c
-Copyright: Copyright 1998-1999, Precision Insight, Inc., Cedar Park, Texas. / 2007-2008, Apple Inc. / 2004, Torrey T. Lyons. / 2002, Greg Parker.
+ hw/xquartz/GL/visualConfigs.c
+Copyright: 2007-2012, Apple Inc.
+ 2004, Torrey T. Lyons.
+ 2002, Greg Parker.
+ 1998, 1999, Precision Insight, Inc., Cedar Park, Texas.
 License: Expat
 
 Files: hw/xquartz/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
+Files: hw/xquartz/NSUserDefaults+XQuartzDefaults.h
+ hw/xquartz/NSUserDefaults+XQuartzDefaults.m
+Copyright: 2021, Apple Inc.
+License: MIT
+
 Files: hw/xquartz/X11Application.h
  hw/xquartz/X11Application.m
  hw/xquartz/X11Controller.h
@@ -1736,13 +1543,13 @@ Copyright: 2003, 2004, Torrey T. Lyons.
 License: Expat
 
 Files: hw/xquartz/bundle/Info.plist.cpp
-Copyright: 2003-2021, X.org Foundation, Inc.
- 2003-2021, Apple Inc.
+Copyright: 2003-2023, X.org Foundation, Inc.
+ 2003-2023, Apple Inc.
  2003, XFree86 Project, Inc.
 License: MIT
 
 Files: hw/xquartz/bundle/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib
@@ -1754,18 +1561,18 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib
-Copyright: no-info-found
+Copyright: TNSIDUNSICCWNSModel
 License: MIT
 
 Files: hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
 Copyright: no-info-found
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/French.lproj/main.nib/*
+Files: hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib
 Copyright: UNKNOWN
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
+Files: hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib
 Copyright: no-info-found
 License: MIT
 
@@ -1802,7 +1609,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
-Copyright: no-info-found
+Copyright: UNKNOWN
 License: MIT
 
 Files: hw/xquartz/bundle/Resources/X11.icns
@@ -1881,10 +1688,6 @@ Files: hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib
 Copyright: UNKNOWN
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings
-Copyright: UNKNOWN
-License: MIT
-
 Files: hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib
 Copyright: UNKNOWN
 License: MIT
@@ -1965,11 +1768,11 @@ Files: hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib
 Copyright: no-info-found
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib
+Files: hw/xquartz/bundle/Resources/tr.lproj/main.nib/*
 Copyright: UNKNOWN
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib
+Files: hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib
 Copyright: no-info-found
 License: MIT
 
@@ -1997,10 +1800,14 @@ Files: hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings
 Copyright: no-info-found
 License: MIT
 
-Files: hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib
+Files: hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/*
 Copyright: UNKNOWN
 License: MIT
 
+Files: hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib
+Copyright: no-info-found
+License: MIT
+
 Files: hw/xquartz/darwin.c
  hw/xquartz/quartzStartup.c
 Copyright: 2007-2012, Apple Inc.
@@ -2015,12 +1822,15 @@ Copyright: 2008-2012, Apple, Inc.
 License: Expat
 
 Files: hw/xquartz/darwinEvents.c
-Copyright: Copyright 1990, 1998 The Open Group / 2007-2008, Apple Inc. / 2004, Kaleb S. KEITHLEY. / 2002-2012, Apple Inc. / 2002-2004, Torrey T. Lyons.
+Copyright: 2004, Kaleb S. KEITHLEY.
+ 2002-2012, Apple Inc.
+ 2002-2004, Torrey T. Lyons.
+ 1990, 1998, The Open Group
 License: Expat
 
 Files: hw/xquartz/darwinXinput.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: hw/xquartz/mach-startup/*
 Copyright: 2002-2012, 2021, Apple Inc.
@@ -2028,11 +1838,12 @@ License: Expat
 
 Files: hw/xquartz/mach-startup/Makefile.am
  hw/xquartz/mach-startup/mach_startup_types.h
+ hw/xquartz/mach-startup/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/mach-startup/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/mach-startup/bundle-main.c
@@ -2041,7 +1852,7 @@ Copyright: 2007-2012, Apple Inc.
 License: Expat
 
 Files: hw/xquartz/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/pbproxy/*
@@ -2049,12 +1860,13 @@ Copyright: 2002-2012, 2021, Apple Inc.
 License: Expat
 
 Files: hw/xquartz/pbproxy/Makefile.am
+ hw/xquartz/pbproxy/meson.build
  hw/xquartz/pbproxy/trick_autotools.c
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/pbproxy/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/quartz.c
@@ -2083,11 +1895,12 @@ Copyright: 2002-2012, 2021, Apple Inc.
 License: Expat
 
 Files: hw/xquartz/xpr/Makefile.am
+ hw/xquartz/xpr/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xquartz/xpr/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xquartz/xpr/appledri.c
@@ -2127,78 +1940,28 @@ Copyright: 2002, Apple Computer, Inc.
  2001, Torrey T. Lyons and Greg Parker.
 License: Expat
 
-Files: hw/xwayland/*
-Copyright: 2011-2014, Intel Corporation
-License: NTP~disclaimer
-
-Files: hw/xwayland/Makefile.am
- hw/xwayland/meson.build
-Copyright: no-info-found
-License: MIT
-
-Files: hw/xwayland/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: hw/xwayland/drm.xml
- hw/xwayland/xwayland-cursor.c
- hw/xwayland/xwayland-input.c
-Copyright: 2010, 2011, 2014, Intel Corporation
- 2008-2011, Kristian Høgsberg
-License: NTP~disclaimer
-
-Files: hw/xwayland/xwayland-cvt.c
-Copyright: 2005, 2006, Luc Verhaegen.
-License: Expat
-
-Files: hw/xwayland/xwayland-glamor-eglstream.c
-Copyright: 2013, 2017, Red Hat Inc.
-License: MIT
-
-Files: hw/xwayland/xwayland-glamor-gbm.c
-Copyright: 2017, Red Hat Inc.
- 2011-2014, Intel Corporation
-License: MIT
-
-Files: hw/xwayland/xwayland-glamor-xv.c
-Copyright: 2014, Intel Corporation
- 2013, 2016, Red Hat
- 1998-2003, The XFree86 Project, Inc.
-License: MIT
-
-Files: hw/xwayland/xwayland-present.c
-Copyright: 2018, Roman Gilg
-License: NTP~disclaimer
-
-Files: hw/xwayland/xwayland-shm.c
-Copyright: 2014, Intel Corporation
- 2012, Collabora, Ltd.
-License: NTP~disclaimer
-
-Files: hw/xwayland/xwayland-vidmode.c
-Copyright: 1993-2003, The XFree86 Project, Inc.
-License: Expat
-
 Files: hw/xwin/*
 Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xwin/InitInput.c
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: hw/xwin/InitOutput.c
  hw/xwin/winmonitors.c
  hw/xwin/winmonitors.h
  hw/xwin/winprocarg.c
-Copyright: Colin Harrison 2005-2008, / 1993, 1998 The Open Group
-License: MIT
+Copyright: 2005-2008, Colin Harrison
+ 1993, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: hw/xwin/Makefile.am
  hw/xwin/XWin.exe.manifest
  hw/xwin/ddraw.h
  hw/xwin/meson.build
  hw/xwin/system.XWinrc
+ hw/xwin/winauth.h
  hw/xwin/winglobals.h
  hw/xwin/winmessages.h
  hw/xwin/winprefslex.c
@@ -2207,7 +1970,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xwin/XWin.rc
@@ -2220,7 +1983,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/dri/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xwin/dri/windowsdri.c
@@ -2233,7 +1996,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/glx/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xwin/glx/dri_helpers.c
@@ -2246,41 +2009,41 @@ Copyright: 2013, The Khronos Group Inc.
 License: Khronos
 
 Files: hw/xwin/glx/glshim.c
-Copyright: Jon TURNEY 2013
-License: Expat
-
-Files: hw/xwin/glx/glthunk.c
-Copyright: Jon TURNEY 2009,2013
+ hw/xwin/glx/glthunk.c
+ hw/xwin/glx/wgl_ext_api.c
+ hw/xwin/glx/wgl_ext_api.h
+Copyright: 2009, 2012, 2013, Jon TURNEY
 License: Expat
 
 Files: hw/xwin/glx/glwindows.h
-Copyright: Jon TURNEY 2009, / Alexander Gottwald 2004
+Copyright: 2009, Jon TURNEY
+ 2004, Alexander Gottwald
 License: Expat
 
 Files: hw/xwin/glx/indirect.c
-Copyright: Jon TURNEY 2009, / Copyright 1998-1999, Precision Insight, Inc., Cedar Park, Texas. / Copyright 2007, 2008, 2009, Apple Inc. / Alexander Gottwald 2004, / 2004, Torrey T. Lyons. / 2002, Greg Parker.
+Copyright: 2009, Jon TURNEY
+ 2007-2009, Apple Inc.
+ 2004, Torrey T. Lyons.
+ 2004, Alexander Gottwald
+ 2002, Greg Parker.
+ 1998, 1999, Precision Insight, Inc., Cedar Park, Texas.
 License: Expat
 
 Files: hw/xwin/glx/indirect.h
-Copyright: 2012, 2014, Jon TURNEY
+Copyright: 2009, 2011-2014, Jon TURNEY
 License: MIT
 
-Files: hw/xwin/glx/wgl_ext_api.c
- hw/xwin/glx/wgl_ext_api.h
-Copyright: Jon TURNEY 2009
-License: Expat
-
 Files: hw/xwin/man/*
 Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xwin/propertystore.h
  hw/xwin/winSetAppUserModelID.c
-Copyright: 2011, Tobias Häußler
+Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/winauth.c
@@ -2304,12 +2067,12 @@ Copyright: no-info-found
 License: MIT
 
 Files: hw/xwin/winclipboard/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: hw/xwin/winclipboard/debug.c
  hw/xwin/winclipboard/winclipboard.h
-Copyright: Jon TURNEY 2013
+Copyright: 2009, 2011-2014, Jon TURNEY
 License: MIT
 
 Files: hw/xwin/winclipboard/internal.h
@@ -2320,51 +2083,50 @@ License: Expat
 Files: hw/xwin/winclipboard/thread.c
  hw/xwin/winclipboard/wndproc.c
  hw/xwin/winclipboard/xevents.c
-Copyright: Colin Harrison 2005-2008, / 2003-2004, Harold L Hunt II
+Copyright: 2005-2008, Colin Harrison
+ 2003, 2004, Harold L Hunt II
 License: Expat
 
 Files: hw/xwin/winclipboard/xwinclip.c
-Copyright: Colin Harrison 2005-2008, / 2003-2004, Harold L Hunt II / 1994-2000, The XFree86 Project, Inc.
+Copyright: 2005-2008, Colin Harrison
+ 2003, 2004, Harold L Hunt II
+ 1994-2000, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xwin/winclipboardwrappers.c
  hw/xwin/winglobals.c
-Copyright: Colin Harrison 2005-2008, / 2003-2004, Harold L Hunt II
+Copyright: 2005-2008, Colin Harrison
+ 2003, 2004, Harold L Hunt II
 License: Expat
 
 Files: hw/xwin/windisplay.c
  hw/xwin/windisplay.h
-Copyright: Jon TURNEY 2009
+ hw/xwin/winmsgwindow.c
+Copyright: 2009, 2011-2014, Jon TURNEY
 License: MIT
 
 Files: hw/xwin/winkeynames.h
 Copyright: 91, 1990, Thomas Roell, Dinkelscherben, Germany.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: hw/xwin/winlayouts.h
 Copyright: 2004, 2005, Alexander Gottwald
 License: Expat
 
-Files: hw/xwin/winmsgwindow.c
-Copyright: Jon TURNEY 2011
-License: MIT
-
 Files: hw/xwin/winmultiwindowicons.h
-Copyright: Jon TURNEY 2012
+Copyright: 2009, 2012, 2013, Jon TURNEY
 License: Expat
 
 Files: hw/xwin/winmultiwindowwindow.c
+ hw/xwin/winmultiwindowwm.c
  hw/xwin/winmultiwindowwndproc.c
  hw/xwin/winprefs.c
  hw/xwin/winprefs.h
  hw/xwin/winprefslex.l
  hw/xwin/winprefsyacc.y
-Copyright: Colin Harrison 2005-2008, / 1994-2000, The XFree86 Project, Inc.
-License: Expat
-
-Files: hw/xwin/winmultiwindowwm.c
  hw/xwin/winwindow.h
-Copyright: Colin Harrison 2005-2009, / 1994-2000, The XFree86 Project, Inc.
+Copyright: 2005-2009, Colin Harrison
+ 1994-2000, The XFree86 Project, Inc.
 License: Expat
 
 Files: hw/xwin/winos.c
@@ -2373,7 +2135,7 @@ License: Expat
 
 Files: hw/xwin/winprefsyacc.c
  hw/xwin/winprefsyacc.h
-Copyright: 1984, 1989, 1990, 2000-2015, 2018-2020, Free Software Foundation
+Copyright: 1984, 1989, 1990, 2000-2015, 2018-2021, Free Software Foundation
 License: GPL-3+ WITH Bison-exception-2.2
 
 Files: hw/xwin/winrandr.c
@@ -2381,14 +2143,9 @@ Copyright: 2009, 2010, Jon TURNEY
  2001-2004, Harold L Hunt II
 License: Expat
 
-Files: hw/xwin/winwindowswm.c
-Copyright: 2003, Torrey T. Lyons.
- 2002, Apple Computer, Inc.
-License: MIT
-
 Files: include/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: include/Makefile.am
  include/displaymode.h
@@ -2409,15 +2166,13 @@ Files: include/Makefile.am
  include/xorg-server.h.in
  include/xorg-server.h.meson.in
  include/xsha1.h
- include/xwayland-config.h.in
- include/xwayland-config.h.meson.in
  include/xwin-config.h.in
  include/xwin-config.h.meson.in
 Copyright: no-info-found
 License: MIT
 
 Files: include/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: include/XIstubs.h
@@ -2430,14 +2185,15 @@ Copyright: 1996, Thomas E. Dickey <dickey@clark.net>
 License: MIT
 
 Files: include/Xprintf.h
+ include/Xserver.d
  include/probes.h
 Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
 License: MIT
 
 Files: include/busfault.h
  include/xserver_poll.h
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: include/client.h
 Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All
@@ -2451,7 +2207,7 @@ Files: include/dbus-core.h
  include/protocol-versions.h
  include/systemd-logind.h
  include/xserver-properties.h
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: include/dixfont.h
@@ -2462,13 +2218,14 @@ License: MIT
 
 Files: include/extension.h
 Copyright: 1987, 1998, The Open Group
-License: Expat
+License: Expat and/or MIT-Open-Group
 
 Files: include/extinit.h
 Copyright: 1996, Thomas E. Dickey <dickey@clark.net>
 License: Expat
 
-Files: include/glx_extinit.h
+Files: include/fourcc.h
+ include/glx_extinit.h
 Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
@@ -2486,11 +2243,11 @@ Copyright: 2010, Intel Corporation
 License: MIT
 
 Files: include/misc.h
-Copyright: 1987, 1991, 1993, 1998, The Open Group
-License: NTP~disclaimer
+Copyright: 1987, 1993, 1998, The Open Group
+License: HPND-sell-variant and/or MIT-Open-Group and/or NTP~disclaimer
 
 Files: include/nonsdk_extinit.h
-Copyright: 2012, 2014, Jon TURNEY
+Copyright: 2009, 2011-2014, Jon TURNEY
 License: MIT
 
 Files: include/ptrveloc.h
@@ -2506,14 +2263,14 @@ License: MIT
 
 Files: install-sh
 Copyright: 1992-1995, X Consortium
-License: Expat
+License: X11
 
 Files: ltmain.sh
-Copyright: 1996-2015, Free Software Foundation, Inc.
-License: GPL-2+ with Libtool exception
+Copyright: 1996-2019, 2021, 2022, Free Software Foundation, Inc.
+License: (Expat and/or GPL-2+) with Libtool exception
 
 Files: m4/*
-Copyright: 2004, 2005, 2007-2009, 2011-2015, Free Software
+Copyright: 2004, 2005, 2007-2009, 2011-2019, 2021, 2022, Free
 License: FSFULLR
 
 Files: m4/ac_define_dir.m4
@@ -2526,14 +2283,18 @@ License: FSFAP
 Files: m4/ax_pthread.m4
 Copyright: 2011, Daniel Richard G. <skunk@iSKUNK.ORG>
  2008, Steven G. Johnson <stevenj@alum.mit.edu>
-License: GPL
+License: GPL-3+ with Autoconf-2.0~Archive exception
 
 Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2015, Free Software Foundation, Inc.
+Copyright: 1996-2001, 2003-2019, 2021, 2022, Free Software
 License: (FSFULLR and/or GPL-2) with Libtool exception
 
+Files: m4/ltsugar.m4
+Copyright: 2004, 2005, 2007, 2008, 2011-2019, 2021, 2022, Free Software
+License: FSFULLR
+
 Files: m4/ltversion.m4
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 2004, 2011-2019, 2021, 2022, Free Software Foundation
 License: FSFULLR
 
 Files: man/*
@@ -2541,16 +2302,16 @@ Copyright: no-info-found
 License: MIT
 
 Files: man/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: man/Xserver.man
-Copyright: 1984-1996, 1998, The Open Group
+Copyright: 1984-1991, 1993, 1994, 1998, The Open Group
 License: MIT
 
 Files: mi/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: mi/Makefile.am
  mi/meson.build
@@ -2561,7 +2322,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: mi/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: mi/micmap.c
@@ -2573,40 +2334,37 @@ Copyright: 1993-2003, The XFree86 Project, Inc.
 License: Expat
 
 Files: mi/micopy.c
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: mi/miinitext.c
+ mi/miinitext.h
 Copyright: 1987, 1998, The Open Group
-License: Expat
+License: Expat and/or MIT-Open-Group
 
 Files: miext/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
-
-Files: miext/Makefile.am
 Copyright: no-info-found
 License: MIT
 
 Files: miext/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
+Files: miext/damage/*
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
+
 Files: miext/damage/Makefile.am
  miext/damage/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: miext/damage/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: miext/rootless/*
-Copyright: no-info-found
-License: MIT
-
 Files: miext/rootless/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: miext/rootless/rootless.h
@@ -2628,7 +2386,7 @@ Copyright: 2003, Torrey T. Lyons.
 License: Expat
 
 Files: miext/rootless/rootlessValTree.c
-Copyright: 1984-1996, 1998, The Open Group
+Copyright: 1984-1991, 1993, 1994, 1998, The Open Group
 License: MIT
 
 Files: miext/rootless/rootlessWindow.c
@@ -2641,13 +2399,17 @@ Files: miext/rootless/rootlessWindow.h
 Copyright: 2001, Greg Parker.
 License: Expat
 
+Files: miext/shadow/*
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
+
 Files: miext/shadow/Makefile.am
  miext/shadow/meson.build
 Copyright: no-info-found
 License: MIT
 
 Files: miext/shadow/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: miext/shadow/c2p_core.h
@@ -2660,11 +2422,15 @@ License: MIT
 
 Files: miext/shadow/shrotate.c
 Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: miext/shadow/shrotpackYX.h
 Copyright: 2004, Philip Blundell
-License: NTP~disclaimer
+License: HPND-sell-variant
+
+Files: miext/sync/*
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: miext/sync/Makefile.am
  miext/sync/meson.build
@@ -2672,7 +2438,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: miext/sync/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: miext/sync/misync.c
@@ -2682,8 +2448,8 @@ Copyright: 2009, 2010, 2015, NVIDIA Corporation
 License: MIT
 
 Files: os/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: os/Makefile.am
  os/meson.build
@@ -2692,7 +2458,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: os/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: os/access.c
@@ -2700,14 +2466,14 @@ Copyright: 1987, 1998, The Open Group
 License: ICU
 
 Files: os/backtrace.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: os/busfault.c
  os/ospoll.c
  os/ospoll.h
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: os/client.c
 Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies). All
@@ -2719,6 +2485,10 @@ Copyright: 2010, Nokia
  2007, 2008, Tiago Vignatti <vignatti at freedesktop org>
 License: Expat
 
+Files: os/log.c
+Copyright: 1987, 1998, The Open Group
+License: Expat and/or MIT-Open-Group
+
 Files: os/reallocarray.c
 Copyright: 2008, Otto Moerbeek <otto@drijf.net>
 License: ISC
@@ -2758,8 +2528,8 @@ Copyright: 2012, Yaakov Selkowitz and Keith Packard
 License: MIT
 
 Files: present/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: present/Makefile.am
  present/meson.build
@@ -2767,19 +2537,15 @@ Copyright: no-info-found
 License: MIT
 
 Files: present/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
-Files: present/present_wnmd.c
-Copyright: 2018, Roman Gilg
-License: NTP~disclaimer
-
 Files: pseudoramiX/*
 Copyright: no-info-found
 License: MIT
 
 Files: pseudoramiX/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: pseudoramiX/pseudoramiX.c
@@ -2787,8 +2553,8 @@ Copyright: 1987, 1991, 1996, 1997, Digital Equipment Corporation, Maynard, Massa
 License: MIT
 
 Files: randr/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/Makefile.am
  randr/meson.build
@@ -2796,7 +2562,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: randr/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: randr/randr.c
@@ -2804,36 +2570,37 @@ Copyright: 2017, Keith Packard
  2006, Intel Corporation
  2002, Hewlett-Packard Company
  2000, Compaq Computer Corporation
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/randrstr.h
 Copyright: 2008, Red Hat, Inc.
  2006, Intel Corporation
  2002, Hewlett-Packard Company
  2000, Compaq Computer Corporation
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/rrcrtc.c
 Copyright: 2010, Red Hat, Inc
  2006, Keith Packard
-License: NTP~disclaimer
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/rroutput.c
-Copyright: 2008, 2013, Red Hat, Inc.
- 2002, 2006, Keith Packard
-License: NTP~disclaimer
+Copyright: 2008, Red Hat, Inc.
+ 2006, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/rrprovider.c
-Copyright: 2012, Red Hat Inc.
-License: NTP~disclaimer
+Copyright: 2019, DisplayLink (UK) Ltd.
+ 2012, Red Hat Inc.
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: randr/rrxinerama.c
 Copyright: 2006, Keith Packard
-License: BSD-3-clause and/or NTP~disclaimer
+License: BSD-3-clause and/or HPND-sell-variant and/or NTP~disclaimer
 
 Files: record/*
-Copyright: 1984-1996, 1998, The Open Group
-License: MIT
+Copyright: 1987-1996, 1998, The Open Group
+License: MIT-Open-Group
 
 Files: record/Makefile.am
  record/meson.build
@@ -2841,12 +2608,12 @@ Copyright: no-info-found
 License: MIT
 
 Files: record/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: render/*
 Copyright: 2000, SuSE, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: render/Makefile.am
  render/meson.build
@@ -2854,7 +2621,7 @@ Copyright: no-info-found
 License: MIT
 
 Files: render/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: render/animcur.c
@@ -2863,24 +2630,31 @@ Files: render/animcur.c
  render/mitrap.c
  render/mitri.c
 Copyright: 2000-2002, Keith Packard, member of The XFree86 Project, Inc.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: render/filter.c
- render/matrix.c
  render/mipict.c
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
+
+Files: render/matrix.c
+Copyright: 2000, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
+License: HPND-sell-variant and/or NTP~disclaimer
 
 Files: test/*
 Copyright: no-info-found
 License: MIT
 
 Files: test/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: test/bigreq/request-length.c
-Copyright: 2016, 2017, Broadcom
+Copyright: 2016-2018, Broadcom
+License: MIT
+
+Files: test/damage/primitives.c
+Copyright: 2016-2018, Broadcom
 License: MIT
 
 Files: test/fixes.c
@@ -2891,7 +2665,7 @@ Files: test/fixes.c
  test/touch.c
  test/xfree86.c
  test/xtest.c
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: test/signal-logging.c
@@ -2899,7 +2673,7 @@ Copyright: 2012, Canonical, Ltd.
 License: MIT
 
 Files: test/simple-xinit.c
-Copyright: 2016, 2017, Broadcom
+Copyright: 2016-2018, Broadcom
 License: MIT
 
 Files: test/string.c
@@ -2907,7 +2681,7 @@ Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
 License: MIT
 
 Files: test/sync/sync.c
-Copyright: 2016, 2017, Broadcom
+Copyright: 2016-2018, Broadcom
 License: MIT
 
 Files: test/xi1/*
@@ -2915,12 +2689,12 @@ Copyright: 1987, 2004-2006, 2009-2011, 2014, Oracle and/or its affiliates.
 License: MIT
 
 Files: test/xi2/*
-Copyright: 2006-2011, 2013-2016, Red Hat, Inc.
+Copyright: 2007-2011, 2013-2016, Red Hat, Inc.
 License: MIT
 
 Files: xfixes/*
-Copyright: 1998-2000, 2002-2004, 2006, 2007, 2013, 2014, 2016, 2017, Keith Packard
-License: NTP~disclaimer
+Copyright: 1998-2000, 2002-2004, Keith Packard
+License: HPND-sell-variant
 
 Files: xfixes/Makefile.am
  xfixes/meson.build
@@ -2928,22 +2702,23 @@ Copyright: no-info-found
 License: MIT
 
 Files: xfixes/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: xfixes/cursor.c
+ xfixes/disconnect.c
  xfixes/xfixes.c
  xfixes/xfixesint.h
-Copyright: 2010, Red Hat, Inc.
+Copyright: 2010, 2021, Red Hat, Inc.
  2006, Oracle and/or its affiliates.
-License: NTP~disclaimer
+License: HPND-sell-variant
 
 Files: xkb/*
 Copyright: no-info-found
 License: MIT
 
 Files: xkb/Makefile.in
-Copyright: 1994-2020, Free Software Foundation, Inc.
+Copyright: 1994-2021, Free Software Foundation, Inc.
 License: FSFULLR
 
 Files: xkb/XKBAlloc.c
@@ -2976,4 +2751,5 @@ License: MIT
 
 Files: xorg-server.m4
 Copyright: 2005, Red Hat, Inc
-License: MIT
+License: MIT-Open-Group
+