diff --git a/debian/apertis/copyright b/debian/apertis/copyright
index fcaec8b227030a7fb8fb18ced70352561b62a79f..28d67fc7becc4ee72f31a34550562dc6d6f77b70 100644
--- a/debian/apertis/copyright
+++ b/debian/apertis/copyright
@@ -2,14 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: no-info-found
-License: GPL and/or LGPL
+License: GPL or LGPL
 
-Files: binutils/* presentations/* utils/*
-Copyright: 1998-2010 Novell/SuSE/Immunix
- 2008-2014 Canonical Ltd.
-License: GPL-2+
-
-Files: libraries/libapparmor/autom4te.cache/* libraries/libapparmor/doc/* libraries/libapparmor/include/* libraries/libapparmor/swig/* libraries/libapparmor/testsuite/*
+Files: libraries/libapparmor/doc/*
 Copyright: 1999-2008 Novell
  2009-2013 Canonical Ltd.
 License: LGPL-2.1+
@@ -33,10 +28,6 @@ Files: binutils/cJSON.c
 Copyright: 2009-2017, Dave Gamble and cJSON contributors
 License: Expat
 
-Files: changehat/*
-Copyright: no-info-found
-License: GPL
-
 Files: changehat/mod_apparmor/*
 Copyright: 1991, 1999, Free Software Foundation, Inc.
 License: LGPL-2.1
@@ -55,6 +46,10 @@ Copyright: 2014, Canonical, Ltd. (
  2004-2006, NOVELL (
 License: LGPL-2.1
 
+Files: changehat/pam_apparmor/*
+Copyright: no-info-found
+License: GPL
+
 Files: changehat/pam_apparmor/Makefile
 Copyright: 2008-2010, 2016, Canonical, Ltd.
  1999-2008, NOVELL (
@@ -69,7 +64,7 @@ Files: changehat/pam_apparmor/pam_apparmor.h
 Copyright: no-info-found
 License: BSD-3-clause
 
-Files: changehat/tomcat_apparmor/*
+Files: changehat/tomcat_apparmor/tomcat_5_0/*
 Copyright: 2002-2007, 2011, Novell/SUSE
 License: GPL-2
 
@@ -77,11 +72,15 @@ Files: changehat/tomcat_apparmor/tomcat_5_0/Makefile
 Copyright: 1999-2007, NOVELL (
 License: GPL-2
 
+Files: changehat/tomcat_apparmor/tomcat_5_5/*
+Copyright: 2002-2007, 2011, Novell/SUSE
+License: GPL-2
+
 Files: changehat/tomcat_apparmor/tomcat_5_5/Makefile
 Copyright: 1999-2007, NOVELL (
 License: GPL-2
 
-Files: common/*
+Files: common/Make-po.rules
 Copyright: 2009-2016, Canonical Ltd.
  1999-2009, NOVELL (
 License: GPL-2
@@ -92,12 +91,12 @@ Copyright: 2010-2015, 2017, 2018, Canonical, Ltd.
 License: GPL-2
 
 Files: debian/*
-Copyright: 2007-2011 Canonical Ltd.
-            2014-2022 intrigeri
+Copyright: 2014-2022, intrigeri <intrigeri@boum.org>
+ 2007-2011, Canonical Ltd.
 License: GPL-2
 
 Files: debian/aa-update-browser
-Copyright: 2010-2016, 2018, 2019, Canonical, Ltd.
+Copyright: 2010-2016, 2018, 2019, 2021, Canonical, Ltd.
 License: GPL-2
 
 Files: debian/apparmor.init
@@ -118,7 +117,7 @@ Files: debian/lava_run_tests
 Copyright: 2012, Collabora ltd.
 License: GPL-2
 
-Files: documentation/*
+Files: documentation/Makefile
 Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
@@ -126,10 +125,6 @@ Files: documentation/logo/*
 Copyright: 2018, Noah Davis <noahadvs@gmail.com>
 License: LGPL-2.1
 
-Files: kernel-patches/*
-Copyright: 2009-2020, Canonical Ltd.
-License: GPL-2
-
 Files: kernel-patches/2.6.36.2/*
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
@@ -165,16 +160,28 @@ Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.10/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.11/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.11/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.12/0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.12/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.2/*
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
@@ -190,61 +197,114 @@ Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.5/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.5/0005-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.6/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.6/0005-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.7/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.7/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.8/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.8/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/3.9/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/3.9/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/4.4/0024-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/4.4/0026-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/4.5/0024-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/4.5/0026-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/4.6/0024-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/4.6/0026-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/4.7/0023-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/4.7/0025-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/v4.11/0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/v4.11/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/v4.12/0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/v4.12/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
+Files: kernel-patches/v4.13/0007-apparmor-add-mount-mediation.patch
+ kernel-patches/v4.13/0017-UBUNTU-SAUCE-apparmor-af_unix-mediation.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/v4.13/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
@@ -255,23 +315,39 @@ Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
-Files: kernel-patches/v4.15/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
+Files: kernel-patches/v4.14/0002-apparmor-af_unix-mediation.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
+Files: kernel-patches/v4.15/*
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: kernel-patches/v4.15/0002-apparmor-af_unix-mediation.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
+Files: kernel-patches/v4.17/0002-apparmor-af_unix-mediation.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: kernel-patches/v4.8/0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
-Files: libraries/*
+Files: kernel-patches/v4.8/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
+Files: libraries/libapparmor/*
 Copyright: 1991, 1999, Free Software Foundation, Inc.
 License: LGPL-2.1
 
 Files: libraries/libapparmor/aclocal.m4
 Copyright: 1996-2021, Free Software Foundation, Inc.
-License: (FSFULLR and/or GPL-2) with Libtool exception
+License: (FSFULLR or GPL-2) with Libtool exception
 
 Files: libraries/libapparmor/compile
  libraries/libapparmor/depcomp
@@ -305,7 +381,7 @@ License: X11
 
 Files: libraries/libapparmor/ltmain.sh
 Copyright: 1996-2015, Free Software Foundation, Inc.
-License: (GPL-2+ and/or GPL-3+) with Libtool exception
+License: (GPL-2+ or GPL-3+) with Libtool exception
 
 Files: libraries/libapparmor/src/*
 Copyright: 2010, 2012-2017, 2020-2022, Canonical, Ltd. (
@@ -346,7 +422,7 @@ Copyright: 2008-2010, 2016, Canonical, Ltd.
  1999-2008, NOVELL (
 License: GPL-2
 
-Files: libraries/libapparmor/swig/python/*
+Files: libraries/libapparmor/swig/python/test/test_python.py.in
 Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
@@ -355,12 +431,12 @@ Copyright: 1989, 1991, Free Software Foundation, Inc.
 License: GPL-2
 
 Files: parser/Makefile
-Copyright: 2018, Christian Boltz
+Copyright: 2018, Christian Boltz <apparmor@cboltz.de>
  1999-2002, 2004-2007, NOVELL (
 License: GPL-2
 
 Files: parser/aa-teardown.pod
-Copyright: 2013-2020, Christian Boltz
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: parser/af_rule.cc
@@ -427,8 +503,6 @@ Files: parser/frob_slack_rc
  parser/parser_regex.c
  parser/parser_symtab.c
  parser/parser_variable.c
- parser/rc.apparmor.debian
- parser/rc.apparmor.redhat
  parser/rc.apparmor.slackware
 Copyright: 1999-2007, NOVELL (
 License: GPL-2
@@ -457,40 +531,50 @@ Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
 Files: parser/profile-load
-Copyright: 2010-2016, 2018, 2019, Canonical, Ltd.
+Copyright: 2010-2016, 2018, 2019, 2021, Canonical, Ltd.
 License: GPL-2
 
 Files: parser/techdoc.tex
 Copyright: no-info-found
-License: GPL and/or LGPL
+License: GPL or LGPL
 
-Files: parser/tst/*
+Files: parser/tst/caching.py
+ parser/tst/errors.py
+ parser/tst/mk_features_file.py
+ parser/tst/testlib.py
+ parser/tst/valgrind_simple.py
 Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
 Files: parser/tst/dirtest.sh
  parser/tst/equality.sh
- parser/tst/gen-dbus.pl
 Copyright: 2010, 2012-2017, 2020-2022, Canonical, Ltd. (
 License: GPL-2
 
-Files: parser/tst/errors/*
+Files: parser/tst/errors/includes/*
 Copyright: 2002-2007, 2011, Novell/SUSE
 License: GPL-2
 
-Files: parser/tst/simple_tests/*
+Files: parser/tst/gen-dbus.py
+Copyright: 2021, Christian Boltz <apparmor@cboltz.de>
+ 2013, Canonical, Ltd. (
+License: GPL-2
+
+Files: parser/tst/gen-xtrans.py
+Copyright: 2011-2020, Christian Boltz <apparmor@cboltz.de>
+ 2009-2013, Canonical Ltd.
+License: GPL-2
+
+Files: parser/tst/simple_tests/includes/base
+ parser/tst/simple_tests/includes/fonts
 Copyright: 2002-2007, 2011, Novell/SUSE
 License: GPL-2
 
-Files: profiles/*
+Files: profiles/Makefile
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
-Files: profiles/apparmor.d/abstractions/*
-Copyright: 2009-2020, Canonical Ltd.
-License: GPL-2
-
 Files: profiles/apparmor.d/abstractions/X
  profiles/apparmor.d/abstractions/audio
  profiles/apparmor.d/abstractions/base
@@ -515,8 +599,12 @@ Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
+Files: profiles/apparmor.d/abstractions/apparmor_api/*
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: profiles/apparmor.d/abstractions/authentication
-Copyright: 2019-2021, Christian Boltz
+Copyright: 2019-2021, Christian Boltz <apparmor@cboltz.de>
  2009-2012, Canonical Ltd
  2002-2009, Novell/SUSE
 License: GPL-2
@@ -534,13 +622,44 @@ Copyright: 2002-2007, 2011, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/crypto
-Copyright: 2020, 2021, Christian Boltz
- 2009-2011, 2014, Canonical Ltd.
+Copyright: 2009-2011, 2014, Canonical Ltd.
+ 2006, 2020, 2021, Christian Boltz <apparmor@cboltz.de>
  2002-2009, Novell/SUSE
 License: GPL-2
 
+Files: profiles/apparmor.d/abstractions/cups-client
+ profiles/apparmor.d/abstractions/dbus
+ profiles/apparmor.d/abstractions/dbus-accessibility
+ profiles/apparmor.d/abstractions/dbus-accessibility-strict
+ profiles/apparmor.d/abstractions/dbus-session
+ profiles/apparmor.d/abstractions/dbus-session-strict
+ profiles/apparmor.d/abstractions/dbus-strict
+ profiles/apparmor.d/abstractions/enchant
+ profiles/apparmor.d/abstractions/fcitx
+ profiles/apparmor.d/abstractions/fcitx-strict
+ profiles/apparmor.d/abstractions/freedesktop.org
+ profiles/apparmor.d/abstractions/hosts_access
+ profiles/apparmor.d/abstractions/ibus
+ profiles/apparmor.d/abstractions/likewise
+ profiles/apparmor.d/abstractions/mir
+ profiles/apparmor.d/abstractions/mozc
+ profiles/apparmor.d/abstractions/p11-kit
+ profiles/apparmor.d/abstractions/samba
+ profiles/apparmor.d/abstractions/smbpass
+ profiles/apparmor.d/abstractions/ssl_keys
+ profiles/apparmor.d/abstractions/ubuntu-unity7-base
+ profiles/apparmor.d/abstractions/xdg-desktop
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: profiles/apparmor.d/abstractions/dovecot-common
-Copyright: 2010-2016, 2018, 2019, Canonical, Ltd.
+Copyright: 2010-2016, 2018, 2019, 2021, Canonical, Ltd.
+License: GPL-2
+
+Files: profiles/apparmor.d/abstractions/groff
+Copyright: 2023, SUSE LLC
+ 2009, Canonical Ltd.
+ 2002-2009, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/gtk
@@ -552,18 +671,22 @@ Copyright: 2015, 2016, Simon Deziel
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/mysql
-Copyright: 2013-2019, 2021, Christian Boltz
+Copyright: 2013-2019, 2021, Christian Boltz <apparmor@cboltz.de>
  2002-2006, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/postfix-common
-Copyright: 2019-2021, Christian Boltz
+Copyright: 2017, 2019-2021, Christian Boltz <apparmor@cboltz.de>
  2015-2018, Canonical, Ltd.
  2002-2006, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/samba-rpcd
-Copyright: 2022, SUSE LLC
+Copyright: 2020, 2022, SUSE LLC
+License: GPL-2
+
+Files: profiles/apparmor.d/abstractions/ubuntu-browsers.d/chromium-browser
+Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
 Files: profiles/apparmor.d/abstractions/wayland
@@ -575,17 +698,31 @@ Copyright: 2014, Canonical Ltd
  2002-2006, Novell/SUSE
 License: GPL-2
 
+Files: profiles/apparmor.d/bin.ping
+ profiles/apparmor.d/sbin.klogd
+ profiles/apparmor.d/sbin.syslogd
+ profiles/apparmor.d/usr.sbin.identd
+ profiles/apparmor.d/usr.sbin.mdnsd
+ profiles/apparmor.d/usr.sbin.nscd
+ profiles/apparmor.d/usr.sbin.ntpd
+ profiles/apparmor.d/usr.sbin.traceroute
+Copyright: 2009-2017, Canonical Ltd.
+ 1998-2009, Novell/SUSE
+License: GPL-2
+
 Files: profiles/apparmor.d/samba-dcerpcd
  profiles/apparmor.d/samba-rpcd
  profiles/apparmor.d/samba-rpcd-classic
  profiles/apparmor.d/samba-rpcd-spoolss
-Copyright: 2022, SUSE LLC
+ profiles/apparmor.d/usr.lib.dovecot.director
+ profiles/apparmor.d/usr.lib.dovecot.doveadm-server
+Copyright: 2020, 2022, SUSE LLC
 License: GPL-2
 
 Files: profiles/apparmor.d/sbin.syslog-ng
-Copyright: 2010, Canonical Ltd.
- 2006-2009, Novell/SUSE
- 2006, Christian Boltz
+Copyright: 2009-2011, 2014, Canonical Ltd.
+ 2006, 2020, 2021, Christian Boltz <apparmor@cboltz.de>
+ 2002-2009, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor.d/tunables/*
@@ -594,7 +731,7 @@ License: GPL-2
 
 Files: profiles/apparmor.d/tunables/dovecot
  profiles/apparmor.d/tunables/etc
-Copyright: 2013-2020, Christian Boltz
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: profiles/apparmor.d/tunables/global
@@ -616,17 +753,18 @@ Files: profiles/apparmor.d/usr.lib.dovecot.anvil
  profiles/apparmor.d/usr.lib.dovecot.log
  profiles/apparmor.d/usr.lib.dovecot.ssl-params
  profiles/apparmor.d/usr.lib.dovecot.stats
-Copyright: 2013-2020, Christian Boltz
+ profiles/apparmor.d/zgrep
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: profiles/apparmor.d/usr.lib.dovecot.auth
  profiles/apparmor.d/usr.lib.dovecot.managesieve
 Copyright: 2014, Christian Wittmer
- 2013-2020, Christian Boltz
+ 2013-2020, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: profiles/apparmor.d/usr.lib.dovecot.deliver
-Copyright: 2011-2020, Christian Boltz
+Copyright: 2011-2020, Christian Boltz <apparmor@cboltz.de>
  2009-2014, Canonical Ltd.
  2009, Dulmandakh Sukhbaatar <dulmandakh@gmail.com>
 License: GPL-2
@@ -637,20 +775,26 @@ Files: profiles/apparmor.d/usr.lib.dovecot.dovecot-auth
  profiles/apparmor.d/usr.lib.dovecot.pop3
  profiles/apparmor.d/usr.lib.dovecot.pop3-login
  profiles/apparmor.d/usr.sbin.dovecot
-Copyright: 2011-2020, Christian Boltz
+Copyright: 2011-2020, Christian Boltz <apparmor@cboltz.de>
  2009-2013, Canonical Ltd.
 License: GPL-2
 
 Files: profiles/apparmor.d/usr.lib.dovecot.managesieve-login
 Copyright: 2014, Christian Wittmer
- 2013-2020, Christian Boltz
+ 2013-2020, Christian Boltz <apparmor@cboltz.de>
  2009-2011, Canonical Ltd.
  2009, Dulmandakh Sukhbaatar <dulmandakh@gmail.com>
 License: GPL-2
 
+Files: profiles/apparmor.d/usr.lib.dovecot.replicator
+Copyright: 2020, SUSE LLC
+ 2011-2013, Christian Boltz <apparmor@cboltz.de>
+ 2009, 2010, Canonical Ltd.
+License: GPL-2
+
 Files: profiles/apparmor.d/usr.lib.dovecot.script-login
 Copyright: 2020, Michael Hirmke
- 2020, Christian Boltz
+ 2020, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: profiles/apparmor.d/usr.sbin.dnsmasq
@@ -669,10 +813,15 @@ Files: profiles/apparmor/profiles/extras/bin.netstat
  profiles/apparmor/profiles/extras/usr.sbin.postalias
  profiles/apparmor/profiles/extras/usr.sbin.postmap
  profiles/apparmor/profiles/extras/usr.sbin.vsftpd
-Copyright: 2013-2019, 2021, Christian Boltz
+Copyright: 2013-2019, 2021, Christian Boltz <apparmor@cboltz.de>
  2002-2006, Novell/SUSE
 License: GPL-2
 
+Files: profiles/apparmor/profiles/extras/chromium_browser
+ profiles/apparmor/profiles/extras/firefox
+Copyright: 2009-2020, Canonical Ltd.
+License: GPL-2
+
 Files: profiles/apparmor/profiles/extras/etc.cron.daily.logrotate
 Copyright: 2016, Seth Arnold
  2016, Daniel Curtis
@@ -697,35 +846,25 @@ License: GPL-2
 
 Files: profiles/apparmor/profiles/extras/postfix-bounce
  profiles/apparmor/profiles/extras/postfix-cleanup
+ profiles/apparmor/profiles/extras/postfix-error
  profiles/apparmor/profiles/extras/postfix-flush
+ profiles/apparmor/profiles/extras/postfix-lmtp
  profiles/apparmor/profiles/extras/postfix-local
  profiles/apparmor/profiles/extras/postfix-master
+ profiles/apparmor/profiles/extras/postfix-pipe
  profiles/apparmor/profiles/extras/postfix-proxymap
  profiles/apparmor/profiles/extras/postfix-showq
  profiles/apparmor/profiles/extras/postfix-smtp
  profiles/apparmor/profiles/extras/postfix-smtpd
  profiles/apparmor/profiles/extras/postfix-trivial-rewrite
-Copyright: 2019-2021, Christian Boltz
+Copyright: 2017, 2019-2021, Christian Boltz <apparmor@cboltz.de>
  2015-2018, Canonical, Ltd.
  2002-2006, Novell/SUSE
 License: GPL-2
 
 Files: profiles/apparmor/profiles/extras/postfix-dnsblog
  profiles/apparmor/profiles/extras/postfix-postscreen
-Copyright: 2010-2016, 2018, 2019, Canonical, Ltd.
-License: GPL-2
-
-Files: profiles/apparmor/profiles/extras/postfix-error
- profiles/apparmor/profiles/extras/postfix-lmtp
- profiles/apparmor/profiles/extras/postfix-pipe
-Copyright: 2018, Canonical, Ltd.
- 2017, Christian Boltz
- 2002-2006, Novell/SUSE
-License: GPL-2
-
-Files: profiles/apparmor/profiles/extras/usr.bin.chromium-browser
- profiles/apparmor/profiles/extras/usr.lib.firefox.firefox
-Copyright: 2009-2020, Canonical Ltd.
+Copyright: 2010-2016, 2018, 2019, 2021, Canonical, Ltd.
 License: GPL-2
 
 Files: profiles/apparmor/profiles/extras/usr.bin.mlmmj-bounce
@@ -743,6 +882,13 @@ Files: profiles/apparmor/profiles/extras/usr.bin.passwd
 Copyright: 2006, Volker Kuhlmann
 License: GPL-2
 
+Files: profiles/apparmor/profiles/extras/usr.bin.pyzorsocket
+ profiles/apparmor/profiles/extras/usr.bin.razorsocket
+ profiles/apparmor/profiles/extras/usr.sbin.clamd
+ profiles/apparmor/profiles/extras/usr.sbin.haproxy
+Copyright: 2020, 2022, SUSE LLC
+License: GPL-2
+
 Files: profiles/apparmor/profiles/extras/usr.sbin.sshd
 Copyright: 2015, 2016, Simon Deziel
  2012, Canonical Ltd.
@@ -767,6 +913,8 @@ Files: tests/regression/apparmor/aa_exec.sh
  tests/regression/apparmor/aa_policy_cache.sh
  tests/regression/apparmor/at_secure.c
  tests/regression/apparmor/at_secure.sh
+ tests/regression/apparmor/attach_disconnected.c
+ tests/regression/apparmor/attach_disconnected.sh
  tests/regression/apparmor/dbus.inc
  tests/regression/apparmor/dbus_eavesdrop.sh
  tests/regression/apparmor/dbus_message.sh
@@ -785,6 +933,8 @@ Files: tests/regression/apparmor/aa_exec.sh
  tests/regression/apparmor/stackonexec.sh
  tests/regression/apparmor/stackprofile.sh
  tests/regression/apparmor/transition.c
+ tests/regression/apparmor/unix_fd_common.c
+ tests/regression/apparmor/unix_fd_common.h
  tests/regression/apparmor/unix_socket.c
  tests/regression/apparmor/unix_socket.inc
  tests/regression/apparmor/unix_socket_abstract.sh
@@ -796,7 +946,7 @@ Files: tests/regression/apparmor/aa_exec.sh
  tests/regression/apparmor/unix_socket_unnamed.sh
  tests/regression/apparmor/xattrs_profile.c
  tests/regression/apparmor/xattrs_profile.sh
-Copyright: 2010-2016, 2018, 2019, Canonical, Ltd.
+Copyright: 2010-2016, 2018, 2019, 2021, Canonical, Ltd.
 License: GPL-2
 
 Files: tests/regression/apparmor/dbus_common.c
@@ -862,7 +1012,7 @@ Copyright: 2013, Kshitij Gupta <kgupta8592@gmail.com>
 License: GPL-2
 
 Files: utils/aa-decode
-Copyright: 2011-2020, Christian Boltz
+Copyright: 2011-2020, Christian Boltz <apparmor@cboltz.de>
  2009-2013, Canonical Ltd.
 License: GPL-2
 
@@ -874,7 +1024,7 @@ Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
 Files: utils/aa-mergeprof
-Copyright: 2014-2020, Christian Boltz <apparmor@cboltz.de>
+Copyright: 2014-2022, Christian Boltz <apparmor@cboltz.de>
  2013, Kshitij Gupta <kgupta8592@gmail.com>
 License: GPL-2
 
@@ -892,7 +1042,7 @@ Copyright: 2016, Canonical, Ltd.
 License: GPL-2
 
 Files: utils/apparmor/*
-Copyright: 2014-2020, Christian Boltz <apparmor@cboltz.de>
+Copyright: 2014-2022, Christian Boltz <apparmor@cboltz.de>
  2013, Kshitij Gupta <kgupta8592@gmail.com>
 License: GPL-2
 
@@ -907,7 +1057,7 @@ License: GPL-2
 Files: utils/apparmor/aare.py
  utils/apparmor/fail.py
  utils/apparmor/profile_list.py
-Copyright: 2014-2021, Christian Boltz <apparmor@cboltz.de>
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: utils/apparmor/common.py
@@ -915,28 +1065,19 @@ Copyright: 2013, Kshitij Gupta <kgupta8592@gmail.com>
  2012, Canonical Ltd.
 License: GPL-2
 
-Files: utils/apparmor/config.py
- utils/apparmor/severity.py
-Copyright: 2013, Kshitij Gupta <kgupta8592@gmail.com>
-License: GPL-2
-
 Files: utils/apparmor/notify.py
-Copyright: 2021, Christian Boltz
+Copyright: 2021, Christian Boltz <apparmor@cboltz.de>
  2018, 2019, Otto Kekäläinen <otto@kekalainen.net>
 License: GPL-2
 
-Files: utils/apparmor/rule/*
-Copyright: 2014-2021, Christian Boltz <apparmor@cboltz.de>
-License: GPL-2
-
-Files: utils/apparmor/rule/__init__.py
- utils/apparmor/rule/capability.py
- utils/apparmor/rule/change_profile.py
- utils/apparmor/rule/network.py
- utils/apparmor/rule/rlimit.py
- utils/apparmor/rule/variable.py
-Copyright: 2014-2020, Christian Boltz <apparmor@cboltz.de>
- 2013, Kshitij Gupta <kgupta8592@gmail.com>
+Files: utils/apparmor/rule/abi.py
+ utils/apparmor/rule/alias.py
+ utils/apparmor/rule/dbus.py
+ utils/apparmor/rule/file.py
+ utils/apparmor/rule/include.py
+ utils/apparmor/rule/ptrace.py
+ utils/apparmor/rule/signal.py
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: utils/apparmor/ui.py
@@ -951,13 +1092,13 @@ Copyright: 2009-2017, Canonical Ltd.
 License: GPL-2
 
 Files: utils/severity.db
-Copyright: 2020, 2021, Christian Boltz
- 2009-2011, 2014, Canonical Ltd.
+Copyright: 2009-2011, 2014, Canonical Ltd.
+ 2006, 2020, 2021, Christian Boltz <apparmor@cboltz.de>
  2002-2009, Novell/SUSE
 License: GPL-2
 
 Files: utils/test/*
-Copyright: 2014-2021, Christian Boltz <apparmor@cboltz.de>
+Copyright: 2013-2022, Christian Boltz <apparmor@cboltz.de>
 License: GPL-2
 
 Files: utils/test/Makefile
@@ -968,27 +1109,16 @@ License: GPL-2
 Files: utils/test/common_test.py
  utils/test/test-aare.py
  utils/test/test-logparser.py
-Copyright: 2014-2020, Christian Boltz <apparmor@cboltz.de>
+Copyright: 2014-2022, Christian Boltz <apparmor@cboltz.de>
  2013, Kshitij Gupta <kgupta8592@gmail.com>
 License: GPL-2
 
 Files: utils/test/logprof.conf
- utils/test/severity.db
  utils/test/severity_broken.db
 Copyright: 2009-2017, Canonical Ltd.
  1998-2009, Novell/SUSE
 License: GPL-2
 
-Files: utils/test/minitools_test.py
- utils/test/test-config.py
-Copyright: 2013, Kshitij Gupta <kgupta8592@gmail.com>
-License: GPL-2
-
-Files: utils/test/runtests-py3.sh
- utils/test/test-aa.py
-Copyright: 2013-2020, Christian Boltz
-License: GPL-2
-
 Files: utils/test/test-aa-cli-bootstrap.py
 Copyright: 2018, 2019, Otto Kekäläinen <otto@kekalainen.net>
 License: GPL-2
@@ -1003,17 +1133,22 @@ Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
 Files: utils/test/test-aa-notify.py
-Copyright: 2019, Otto Kekäläinen
+Copyright: 2019, Otto Kekäläinen <otto@kekalainen.net>
  2011, 2012, Canonical Ltd.
 License: GPL-2
 
+Files: utils/test/test-config.py
+ utils/test/test-minitools.py
+Copyright: 2013, Kshitij Gupta <kgupta8592@gmail.com>
+License: GPL-2
+
 Files: utils/test/test-severity.py
 Copyright: 2015, Christian Boltz <apparmor@cboltz.de>
  2014, Canonical, Ltd.
  2013, Kshitij Gupta <kgupta8592@gmail.com>
 License: GPL-2
 
-Files: utils/vim/*
+Files: utils/vim/apparmor.vim.in
 Copyright: 2006-2012, Christian Boltz.
  2005, Novell, Inc.
 License: GPL-2
@@ -1027,7 +1162,7 @@ Files: utils/vim/create-apparmor.vim.py
 Copyright: 2009-2020, Canonical Ltd.
 License: GPL-2
 
-Files: documentation/AppArmor_Developer_1-Kernel_Notes.odt documentation/AppArmor_Developer_2-policy_layout_and_encoding.odt documentation/AppArmor_Developer_3-HFA.odt documentation/AppArmor_Developer_4-Policy_compilation.odt documentation/AppArmor_Developer_5-extending_apparmor_to_userspace.odt documentation/AppArmor_Policy.odt documentation/Techdoc-eHFA.odt parser/tst/minimize.sh presentations/LSS_apparmor-labeling-2013.odp presentations/LSS_apparmor-userspace-2013.odp presentations/apparmor-opensuse-2018.odp presentations/lss-2014-apparmor-review.odp presentations/lss-apparmor-update-2016.odp presentations/lss-apparmor-update-2017.odp
+Files: binutils/aa-enabled.pod binutils/aa-exec.pod binutils/aa-features-abi.pod binutils/aa-status.pod documentation/AppArmor_Developer_1-Kernel_Notes.odt documentation/AppArmor_Developer_2-policy_layout_and_encoding.odt documentation/AppArmor_Developer_3-HFA.odt documentation/AppArmor_Developer_4-Policy_compilation.odt documentation/AppArmor_Developer_5-extending_apparmor_to_userspace.odt documentation/AppArmor_Policy.odt parser/tst/minimize.sh presentations/LSS_apparmor-labeling-2013.odp presentations/LSS_apparmor-userspace-2013.odp presentations/apparmor-opensuse-2018.odp presentations/lss-2014-apparmor-review.odp presentations/lss-apparmor-update-2016.odp presentations/lss-apparmor-update-2017.odp utils/aa-autodep.pod utils/aa-complain.pod utils/aa-disable.pod utils/aa-easyprof.pod utils/aa-enforce.pod utils/aa-genprof.pod utils/aa-logprof.pod utils/aa-notify.pod utils/aa-sandbox.pod utils/aa-unconfined.pod utils/logprof.conf.pod
 Copyright: 1998-2010 Novell/SuSE/Immunix
  2008-2014 Canonical Ltd.
 License: GPL-2+
@@ -1044,7 +1179,7 @@ Copyright: 2006 SUSE Linux Products GmbH, Nuernberg, Germany
  2010 Canonical Ltd.
 License: BSD-3-clause or GPL-2+
 
-Files: libraries/libapparmor/INSTALL libraries/libapparmor/Makefile.in libraries/libapparmor/autom4te.cache/traces.0 libraries/libapparmor/doc/Makefile.in libraries/libapparmor/src/Makefile.in libraries/libapparmor/swig/python/Makefile.in libraries/libapparmor/swig/python/test/Makefile.in
+Files: libraries/libapparmor/INSTALL libraries/libapparmor/Makefile.in libraries/libapparmor/autom4te.cache/output.0 libraries/libapparmor/autom4te.cache/output.1 libraries/libapparmor/autom4te.cache/output.2 libraries/libapparmor/autom4te.cache/traces.0 libraries/libapparmor/doc/Makefile.in libraries/libapparmor/include/Makefile.in libraries/libapparmor/include/sys/Makefile.in libraries/libapparmor/src/Makefile.in libraries/libapparmor/swig/Makefile.in libraries/libapparmor/swig/perl/Makefile.in libraries/libapparmor/swig/python/Makefile.in libraries/libapparmor/swig/python/test/Makefile.in libraries/libapparmor/swig/ruby/Makefile.in libraries/libapparmor/testsuite/Makefile.in libraries/libapparmor/testsuite/config/Makefile.in libraries/libapparmor/testsuite/lib/Makefile.in libraries/libapparmor/testsuite/libaalogparse.test/Makefile.in
 Copyright: 1999-2008 Novell
  2009-2013 Canonical Ltd.
 License: LGPL-2.1+