Drop my copyright headers

perl -i -0pe 's/\s*Copyright © .... Zbigniew Jędrzejewski.*?\n/\n/gms' man/*xml
git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/(#\n)?# +Copyright © [0-9, -]+ Zbigniew Jędrzejewski.*?\n//gms'
git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s*\/\*\*\*\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*?\s*\*\*\*\/\s*/\n\n/gms'
git grep -e 'Copyright.*Jędrzejewski' -l | xargs perl -i -0pe 's/\s+Copyright © [0-9, -]+ Zbigniew Jędrzejewski[^\n]*//gms'

199 files changed, 4 insertions, 485 deletions

diff --git a/catalog/meson.build b/catalog/meson.build
index 4598a318a7..1b13150894 100644
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 in_files = '''
         systemd.bg.catalog
diff --git a/doc/sysvinit/meson.build b/doc/sysvinit/meson.build
index 7404321ba3..fbac59ae49 100644
--- a/doc/sysvinit/meson.build
+++ b/doc/sysvinit/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 file = configure_file(
         input : 'README.in',
diff --git a/doc/var-log/meson.build b/doc/var-log/meson.build
index 88ef5b1b42..0ddff20ce5 100644
--- a/doc/var-log/meson.build
+++ b/doc/var-log/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 file = configure_file(
         input : 'README.in',
diff --git a/hwdb/meson.build b/hwdb/meson.build
index 7a39e02c40..158292c712 100644
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 hwdb_files = files('''
         20-pci-vendor-model.hwdb
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index c6cbacb60a..4900a25778 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -4,8 +4,6 @@
 #
 # This file is distributed under the MIT license, see below.
 #
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
 # The MIT License (MIT)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/man/busctl.xml b/man/busctl.xml
index b4de71080a..b72493f045 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="busctl"
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index 447a90831d..81391cfcfa 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="coredump.conf" conditional="ENABLE_COREDUMP"
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml
index bc88a28e0a..31f8fa14f2 100644
--- a/man/coredumpctl.xml
+++ b/man/coredumpctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="coredumpctl" conditional='ENABLE_COREDUMP'
diff --git a/man/custom-man.xsl b/man/custom-man.xsl
index 4156a06730..d9af519d32 100644
--- a/man/custom-man.xsl
+++ b/man/custom-man.xsl
@@ -2,8 +2,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/man/environment.d.xml b/man/environment.d.xml
index 82bb208730..53b26c8f2d 100644
--- a/man/environment.d.xml
+++ b/man/environment.d.xml
@@ -5,7 +5,6 @@
   SPDX-License-Identifier: LGPL-2.1+
 
   Copyright © 2016 Red Hat, Inc.
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="environment.d" conditional='ENABLE_ENVIRONMENT_D'
     xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/hwdb.xml b/man/hwdb.xml
index 590c0a4802..f35ce9eea4 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -6,7 +6,6 @@
   SPDX-License-Identifier: LGPL-2.1+
 
   Copyright © 2014 Tom Gundersen
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="hwdb" conditional="ENABLE_HWDB">
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 21944b8e00..ea738655ff 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="journal-upload.conf" conditional='HAVE_MICROHTTPD'
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 81ecde4653..a177fbe463 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refsect1>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 6c4f2a574c..c96ffcaf79 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="machinectl" conditional='ENABLE_MACHINED'
diff --git a/man/meson.build b/man/meson.build
index 58a2343eb7..ec05d73bc6 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 # This is lame, I know, but meson has no other include mechanism
 subdir('rules')
diff --git a/man/networkctl.xml b/man/networkctl.xml
index 64e0f0127a..8d0f1cc83a 100644
--- a/man/networkctl.xml
+++ b/man/networkctl.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="networkctl" conditional='ENABLE_NETWORKD'
diff --git a/man/sd-bus.xml b/man/sd-bus.xml
index 6cff1d7d4b..642b686f33 100644
--- a/man/sd-bus.xml
+++ b/man/sd-bus.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd-bus" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 0425e60c5a..0c11d8ccfa 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_creds_get_pid" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 63c29a82d5..c5adbaff83 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_creds_new_from_pid" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 2d9d99087e..cf027e4131 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_default" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 8a383089b2..064db37019 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_error" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index f971cb35f1..bf037356f8 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_message_append"
diff --git a/man/sd_bus_message_append_array.xml b/man/sd_bus_message_append_array.xml
index 8365ae78b8..fb38670dd9 100644
--- a/man/sd_bus_message_append_array.xml
+++ b/man/sd_bus_message_append_array.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_message_append_array"
diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml
index a84df2c953..20740a9a72 100644
--- a/man/sd_bus_message_append_basic.xml
+++ b/man/sd_bus_message_append_basic.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_message_append_basic" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml
index 88e3407a8d..8b693ac710 100644
--- a/man/sd_bus_message_append_string_memfd.xml
+++ b/man/sd_bus_message_append_string_memfd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_message_append_string_memfd"
diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml
index 0ca0bcc929..e10b2f3ef7 100644
--- a/man/sd_bus_message_append_strv.xml
+++ b/man/sd_bus_message_append_strv.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_message_append_strv"
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 4771beabf6..56f6491e30 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_new" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 16d0ef099b..9727758743 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_bus_path_encode">
diff --git a/man/sd_event_add_child.xml b/man/sd_event_add_child.xml
index 771b22d7d7..1bbb55520f 100644
--- a/man/sd_event_add_child.xml
+++ b/man/sd_event_add_child.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_add_child" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml
index f9b392343a..7fd0a9e84a 100644
--- a/man/sd_event_add_defer.xml
+++ b/man/sd_event_add_defer.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_add_defer" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
index a1ff7d440f..7b1db8aaeb 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_add_signal" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_get_fd.xml b/man/sd_event_get_fd.xml
index 06555212f6..25f1b9bdd1 100644
--- a/man/sd_event_get_fd.xml
+++ b/man/sd_event_get_fd.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_get_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_run.xml b/man/sd_event_run.xml
index 01f8d25e01..3b872e3d63 100644
--- a/man/sd_event_run.xml
+++ b/man/sd_event_run.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_run" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_source_set_description.xml b/man/sd_event_source_set_description.xml
index ef3dcbaf2a..9c540b7dfe 100644
--- a/man/sd_event_source_set_description.xml
+++ b/man/sd_event_source_set_description.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_source_set_description" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index ca9647b99d..5d44c963b1 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="sd_event_wait" xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 8a170f7457..e1cb7d31ed 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
   Copyright © 2014 Josh Triplett
 -->
 
diff --git a/man/standard-options.xml b/man/standard-options.xml
index 4941710a2a..bea92e89fb 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <variablelist>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 42e46af8d6..ea0b1efdf7 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-coredump" conditional='ENABLE_COREDUMP'
diff --git a/man/systemd-environment-d-generator.xml b/man/systemd-environment-d-generator.xml
index c6a872db00..1d282b4a89 100644
--- a/man/systemd-environment-d-generator.xml
+++ b/man/systemd-environment-d-generator.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-environment-d-generator" conditional='ENABLE_ENVIRONMENT_D'>
 
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index aa9291e0f6..c4752368c5 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-journal-gatewayd.service" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-journal-remote.service.xml b/man/systemd-journal-remote.service.xml
index 1ee709f2f3..52e7f0dd39 100644
--- a/man/systemd-journal-remote.service.xml
+++ b/man/systemd-journal-remote.service.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-journal-remote" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml
index c0e869f7f6..b380156b29 100644
--- a/man/systemd-journal-upload.service.xml
+++ b/man/systemd-journal-upload.service.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-journal-upload" conditional='HAVE_MICROHTTPD'
diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index a18c11aebb..e99bf11d5c 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-machined.service" conditional='ENABLE_MACHINED'>
diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml
index 380934f9cb..f9a7f0f120 100644
--- a/man/systemd-makefs@.service.xml
+++ b/man/systemd-makefs@.service.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-makefs@.service">
 
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 67d357c555..3334efab92 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-run"
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 7ed630fdb3..ed2e4e6673 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-sleep.conf"
diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml
index 5bae313f9c..a708c9c229 100644
--- a/man/systemd-socket-activate.xml
+++ b/man/systemd-socket-activate.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-socket-activate"
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 1f55f4fbd1..a4e63778da 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd-suspend.service"
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
index 16d10f743b..84bbb3f3a7 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.xml
@@ -3,8 +3,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 <refentry id="systemd-sysv-generator" conditional="HAVE_SYSV_COMPAT">
 
diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml
index 3e3e94136f..4941cd2083 100644
--- a/man/systemd.environment-generator.xml
+++ b/man/systemd.environment-generator.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.environment-generator" conditional='ENABLE_ENVIRONMENT_D'
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 208dd80138..97f3965c36 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -7,8 +7,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.generator">
diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml
index b74b2852b0..260c8ffa8b 100644
--- a/man/systemd.offline-updates.xml
+++ b/man/systemd.offline-updates.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.offline-updates">
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 75497f0b3b..5d95fb67ca 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.resource-control">
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index 2a29036396..c6c68b7e2d 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.scope">
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 73cedee827..163f479cae 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="systemd.slice">
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 7c915406f8..6010fc5c0f 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <refentry id="udev.conf"
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 6aeda8e44c..eb875661de 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
 -->
 
 <variablelist>
diff --git a/meson.build b/meson.build
index 8894945283..a97168961d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 project('systemd', 'c',
         version : '238',
diff --git a/meson_options.txt b/meson_options.txt
index 4da96f5d98..58ee0daad6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,5 @@
 # -*- mode: meson -*-
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
        description : '''/bin, /sbin aren't symlinks into /usr''')
diff --git a/network/meson.build b/network/meson.build
index a7d0431e5b..59d4be1a17 100644
--- a/network/meson.build
+++ b/network/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 if conf.get('ENABLE_NETWORKD') == 1
         install_data('80-container-host0.network',
diff --git a/po/meson.build b/po/meson.build
index f1872c0f7e..3611ac90f1 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 i18n = import('i18n')
 i18n.gettext(meson.project_name(),
diff --git a/presets/meson.build b/presets/meson.build
index 4068370db0..0b16acf59a 100644
--- a/presets/meson.build
+++ b/presets/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 install_data('90-systemd.preset',
              install_dir : systempresetdir)
diff --git a/rules/meson.build b/rules/meson.build
index 170873d883..b6a32ba77e 100644
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 rules = files('''
         60-block.rules
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
index 586b826ca5..47b9fabe8f 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
 # This file is part of systemd.
-#
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 # Copyright © 2014 Thomas H.P. Andersen
 #
 # systemd is free software; you can redistribute it and/or modify it
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index d783e622e6..e7fabe29aa 100644
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 bashcompletiondir = get_option('bashcompletiondir')
 if bashcompletiondir == ''
diff --git a/shell-completion/bash/systemd-resolve b/shell-completion/bash/systemd-resolve
index 18bcfbb060..86b8db2cf8 100644
--- a/shell-completion/bash/systemd-resolve
+++ b/shell-completion/bash/systemd-resolve
@@ -3,8 +3,6 @@
 #
 # This file is part of systemd.
 #
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
 # systemd is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
index ec9c21addb..d317466b26 100644
--- a/shell-completion/bash/systemd-run
+++ b/shell-completion/bash/systemd-run
@@ -3,8 +3,6 @@
 #
 # This file is part of systemd.
 #
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-#
 # systemd is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
index 0e2e5c60a9..801ed48010 100644
--- a/shell-completion/zsh/_busctl
+++ b/shell-completion/zsh/_busctl
@@ -5,8 +5,6 @@
 #
 # This file is part of systemd.
 #
-# Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-#
 # systemd is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/_systemd-resolve b/shell-completion/zsh/_systemd-resolve
index 51033aa6a4..b54d22f816 100644
--- a/shell-completion/zsh/_systemd-resolve
+++ b/shell-completion/zsh/_systemd-resolve
@@ -4,8 +4,6 @@
 #
 # This file is part of systemd.
 #
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
 # systemd is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2.1 of the License, or
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index 6776d3a110..7fc9fcfc71 100644
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 zshcompletiondir = get_option('zshcompletiondir')
 if zshcompletiondir == ''
diff --git a/src/activate/activate.c b/src/activate/activate.c
index 18a8e932b3..45386a38f4 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <getopt.h>
 #include <sys/epoll.h>
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 4d2479e5b9..ae39c3149f 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdlib.h>
 
diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h
index ca4929b5a5..f6b7f54961 100644
--- a/src/analyze/analyze-verify.h
+++ b/src/analyze/analyze-verify.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <stdbool.h>
 
 #include "path-lookup.h"
diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index d99ea3089c..3a69a259b1 100644
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_analyze_sources = files('''
         analyze.c
diff --git a/src/basic/crypt-util.c b/src/basic/crypt-util.c
index f977fa469a..9fa886ed31 100644
--- a/src/basic/crypt-util.c
+++ b/src/basic/crypt-util.c
@@ -1,6 +1,4 @@
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
 
 #if HAVE_LIBCRYPTSETUP
 #include "crypt-util.h"
diff --git a/src/basic/crypt-util.h b/src/basic/crypt-util.h
index b87e40b3dc..5b03cb072d 100644
--- a/src/basic/crypt-util.h
+++ b/src/basic/crypt-util.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #if HAVE_LIBCRYPTSETUP
 #include <libcryptsetup.h>
diff --git a/src/basic/exec-util.h b/src/basic/exec-util.h
index 4b0bddbb88..8b1f18139c 100644
--- a/src/basic/exec-util.h
+++ b/src/basic/exec-util.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdbool.h>
 
diff --git a/src/basic/gcrypt-util.h b/src/basic/gcrypt-util.h
index f5e286fb3e..87eb606891 100644
--- a/src/basic/gcrypt-util.h
+++ b/src/basic/gcrypt-util.h
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
-
 #pragma once
 
 #include <errno.h>
diff --git a/src/basic/journal-importer.c b/src/basic/journal-importer.c
index b07523d6be..ca203bbbfc 100644
--- a/src/basic/journal-importer.c
+++ b/src/basic/journal-importer.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/basic/journal-importer.h b/src/basic/journal-importer.h
index 04501d4746..f49ce734a1 100644
--- a/src/basic/journal-importer.h
+++ b/src/basic/journal-importer.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #pragma once
 
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 499bc21208..085ccd0915 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <string.h>
 
diff --git a/src/basic/login-util.h b/src/basic/login-util.h
index 9fddd86eb3..e1e62e12b7 100644
--- a/src/basic/login-util.h
+++ b/src/basic/login-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <stdbool.h>
 #include <unistd.h>
 
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 1836a34380..31625b1785 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 basic_sources = files('''
         MurmurHash2.c
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index dd427af380..93c60458bf 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
-
 /* Missing glibc definitions to access certain kernel APIs */
 
 #include <sys/types.h>
diff --git a/src/basic/module-util.h b/src/basic/module-util.h
index 2ec6c169b2..8fa121ed98 100644
--- a/src/basic/module-util.h
+++ b/src/basic/module-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <libkmod.h>
 
 #include "macro.h"
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 3d5db86a6d..8ec1fa7be4 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 efi_headers = files('''
         console.h
diff --git a/src/core/meson.build b/src/core/meson.build
index c02b0c70da..3852c5e9d8 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 libcore_la_sources = '''
         audit-fd.c
diff --git a/src/core/triggers.systemd.in b/src/core/triggers.systemd.in
index c88f55a581..10b1889b57 100644
--- a/src/core/triggers.systemd.in
+++ b/src/core/triggers.systemd.in
@@ -2,8 +2,6 @@
 #  SPDX-License-Identifier: LGPL-2.1+
 #
 #  This file is part of systemd.
-#
-#  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 #  Copyright © 2018 Neal Gompa
 
 # The contents of this are an example to be copied into systemd.spec.
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 7f8d9843fa..99d07c14fb 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/src/coredump/meson.build b/src/coredump/meson.build
index 550fbe0955..bfba7ef58c 100644
--- a/src/coredump/meson.build
+++ b/src/coredump/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_coredump_sources = files('''
         coredump.c
diff --git a/src/coredump/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c
index 839f234d82..75fb442873 100644
--- a/src/coredump/test-coredump-vacuum.c
+++ b/src/coredump/test-coredump-vacuum.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdlib.h>
 
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 44a36a7e44..21cce7e8b5 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c
index ea18cd60b7..1719b69b98 100644
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "sd-path.h"
 
diff --git a/src/hostname/meson.build b/src/hostname/meson.build
index 732f33de99..db66ba5531 100644
--- a/src/hostname/meson.build
+++ b/src/hostname/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 if conf.get('ENABLE_HOSTNAMED') == 1
         install_data('org.freedesktop.hostname1.conf',
diff --git a/src/import/meson.build b/src/import/meson.build
index 2fb4232d5e..283ba08c67 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_importd_sources = files('''
         importd.c
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
index 0a8a0c144d..535d06ac76 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
index 8b605bbc1a..d6c77360a6 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "sd-event.h"
 
 #include "journal-importer.h"
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index 844f8f2315..9211e7df82 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "journal-remote.h"
diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index 745deace80..7ed32aa5aa 100644
--- a/src/journal-remote/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "journal-file.h"
 #include "journal-importer.h"
 
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 150c057c75..beb75a1cb4 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index eb7f814c59..e083ea9c74 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "sd-event.h"
 
 #include "hashmap.h"
diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 71fbcf85d6..3991dcb7d2 100644
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <curl/curl.h>
 #include <stdbool.h>
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 2e9bdc6d36..209e5011d9 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <curl/curl.h>
 #include <fcntl.h>
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 7a8d01647a..2887daa4bf 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_journal_upload_sources = files('''
         journal-upload.h
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 9eb7c1bffb..34dd9ea555 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
index a9c03d455b..a50a2a75c7 100644
--- a/src/journal-remote/microhttpd-util.h
+++ b/src/journal-remote/microhttpd-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2012 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <microhttpd.h>
 #include <stdarg.h>
 
diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index 9061bf82df..b30963da66 100644
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 #include <linux/audit.h>
diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index 971545e044..965b044cbf 100644
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "macro.h"
 
 const char *audit_type_to_string(int type);
diff --git a/src/journal/meson.build b/src/journal/meson.build
index 9cab720da3..807dece545 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 journal_client_sources = files('''
         audit-type.c
diff --git a/src/journal/test-audit-type.c b/src/journal/test-audit-type.c
index a3f6537d22..20e654b599 100644
--- a/src/journal/test-audit-type.c
+++ b/src/journal/test-audit-type.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 #include <linux/audit.h>
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index 836e380494..8eae993780 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c
index 4eedd841d2..dd53476898 100644
--- a/src/journal/test-compress-benchmark.c
+++ b/src/journal/test-compress-benchmark.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "compress.h"
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index 1eb0d05815..a43672b6e1 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "sd-journal.h"
 
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 22811a3115..1f0c9f8f2a 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright © 2013 Marius Vollmer
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 ***/
 
 #include <fcntl.h>
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index bfab25cb2a..c6e6f816d9 100644
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 install_data('kernel-install',
              install_mode : 'rwxr-xr-x',
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 3c1bbff726..56d470ff68 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 sources = files('''
         sd-dhcp-client.c
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index a494b7cec3..070fd6c633 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 id128_sources = files('''
         sd-id128/id128-util.c
diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c
index ca1aa48796..ff0790bf5a 100644
--- a/src/libsystemd/sd-bus/bus-common-errors.c
+++ b/src/libsystemd/sd-bus/bus-common-errors.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c
index 58fef014e2..d1d962ebb2 100644
--- a/src/libsystemd/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/sd-bus/test-bus-cleanup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 2b6a01d8f2..323c7e97d0 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 libudev_sources = files('''
         libudev-private.h
diff --git a/src/locale/meson.build b/src/locale/meson.build
index f3d894b468..e87a10ebeb 100644
--- a/src/locale/meson.build
+++ b/src/locale/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_localed_sources = files('''
         localed.c
diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index 9fa5a59c67..e20731b253 100644
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "keymap-util.h"
diff --git a/src/login/meson.build b/src/login/meson.build
index 70d7a784f2..4326a452c6 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_logind_sources = files('''
         logind.c
diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c
index 08153b0b35..02ff57ab10 100644
--- a/src/login/test-login-shared.c
+++ b/src/login/test-login-shared.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "login-util.h"
 #include "macro.h"
diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c
index 642a81dea4..02b871968e 100644
--- a/src/login/test-login-tables.c
+++ b/src/login/test-login-tables.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "logind-action.h"
 #include "logind-session.h"
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 3b8ce24a1e..d515877138 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_machined_sources = files('''
         machined.c
diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c
index cfd3498267..04db7d8259 100644
--- a/src/machine/test-machine-tables.c
+++ b/src/machine/test-machine-tables.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "machine.h"
 #include "test-tables.h"
diff --git a/src/network/meson.build b/src/network/meson.build
index 78d3b6b01a..8f5544ea04 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 sources = files('''
         netdev/bond.c
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index a826ce97a0..fc1646f4bf 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c
index e91290e8b0..9920f516b7 100644
--- a/src/network/test-routing-policy-rule.c
+++ b/src/network/test-routing-policy-rule.c
@@ -1,7 +1,5 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
 #include "fd-util.h"
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 6b91c2be83..be54ba36c5 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 libnspawn_core_sources = files('''
         nspawn-cgroup.c
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index e1946b72fc..d2053cd391 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index ae060d47e8..8c2a783e9d 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -1,7 +1,5 @@
 /***
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 ***/
 
 #include <fcntl.h>
diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
index af55085ab2..c96f60a064 100644
--- a/src/resolve/dns-type.c
+++ b/src/resolve/dns-type.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <sys/socket.h>
 #include <errno.h>
diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h
index 866b7b47e4..8721536b5d 100644
--- a/src/resolve/dns-type.h
+++ b/src/resolve/dns-type.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "macro.h"
 
 /* DNS record types, taken from
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index aae5faf5cd..759d1395d4 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 basic_dns_sources = files('''
         resolved-dns-dnssec.c
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 5780f60df9..e96c13fea6 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <getopt.h>
 #include <net/if.h>
diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c
index 2b773d9961..905f000dc2 100644
--- a/src/resolve/test-dns-packet.c
+++ b/src/resolve/test-dns-packet.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <net/if.h>
 #include <glob.h>
diff --git a/src/resolve/test-resolve-tables.c b/src/resolve/test-resolve-tables.c
index ec7cc11428..842d42b311 100644
--- a/src/resolve/test-resolve-tables.c
+++ b/src/resolve/test-resolve-tables.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "dns-type.h"
 #include "test-tables.h"
diff --git a/src/resolve/test-resolved-packet.c b/src/resolve/test-resolved-packet.c
index 3db6fbb044..22ae26ce12 100644
--- a/src/resolve/test-resolved-packet.c
+++ b/src/resolve/test-resolved-packet.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "log.h"
 #include "resolved-dns-packet.h"
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index a48a124078..db8c047117 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,6 +1,4 @@
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
 
 #include <stdio.h>
 #include <linux/magic.h>
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h
index 4adc971ae0..63083dc0d8 100644
--- a/src/shared/bootspec.h
+++ b/src/shared/bootspec.h
@@ -1,6 +1,4 @@
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
+
 
 #pragma once
 
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 49c79a5bba..357c66d800 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index 5769746293..ae7379beee 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "hashmap.h"
 #include "macro.h"
 #include "set.h"
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 9a07ce7286..6fd9866c00 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <mntent.h>
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index a88a692fea..9820f78ca8 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 8cd4c15233..078d5734be 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/shared/install-printf.h b/src/shared/install-printf.h
index a6aaea8fae..378b3bfd92 100644
--- a/src/shared/install-printf.h
+++ b/src/shared/install-printf.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "install.h"
 
 int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret);
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index b8c71f2611..89b76af5b3 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "acl-util.h"
 #include "fs-util.h"
diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h
index 0fbe4834a3..404fa53b30 100644
--- a/src/shared/journal-util.h
+++ b/src/shared/journal-util.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdbool.h>
 #include <sys/types.h>
diff --git a/src/shared/meson.build b/src/shared/meson.build
index d81c2af476..54e77e9af6 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 shared_sources = files('''
         acl-util.h
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 8fa0d6ff8c..9e4ce183d3 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
   Copyright © 2018 Dell Inc.
 ***/
 
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h
index 65a532c511..6bf035969a 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include <linux/fiemap.h>
 #include "time-util.h"
 
diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index e328b96ea6..4eeda3b1bb 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 2036059115..16a0eed841 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <string.h>
 
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 26bf848fd9..f36c568b5a 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -1,10 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
-
 #include "udev.h"
 #include "util.h"
 
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 7e8594357d..f26aa453c9 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
   Copyright © 2010-2017 Canonical
   Copyright © 2018 Dell Inc.
 ***/
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index c560b51d69..5f84439a58 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 _systemd_headers = '''
         sd-bus.h
diff --git a/src/test/meson.build b/src/test/meson.build
index e4ddff9b50..7da7e3a22c 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 awkscript = 'test-hashmap-ordered.awk'
 test_hashmap_ordered_c = custom_target(
diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c
index 589ed67055..81eb40444b 100644
--- a/src/test/test-acl-util.c
+++ b/src/test/test-acl-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c
index f5456987b5..ffd6da80fe 100644
--- a/src/test/test-ask-password-api.c
+++ b/src/test/test-ask-password-api.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 77fecd4016..d49356315e 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "build.h"
diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c
index d9dff0fe45..148ebaa4d0 100644
--- a/src/test/test-dlopen.c
+++ b/src/test/test-dlopen.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <dlfcn.h>
 #include <stdlib.h>
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index f63e5a4ccb..e645d4968e 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <string.h>
 
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c
index 37ea77c28e..bd873a39be 100644
--- a/src/test/test-fstab-util.c
+++ b/src/test/test-fstab-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "alloc-util.h"
 #include "fstab-util.h"
diff --git a/src/test/test-gcrypt-util.c b/src/test/test-gcrypt-util.c
index 730c920551..d97523251d 100644
--- a/src/test/test-gcrypt-util.c
+++ b/src/test/test-gcrypt-util.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+
- * Copyright © 2018 Zbigniew Jędrzejewski-Szmek
+ *
  */
 
 #include "alloc-util.h"
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c
index b8e9abd8ff..0f4e2d62ce 100644
--- a/src/test/test-hostname-util.c
+++ b/src/test/test-hostname-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright © 2013 Thomas H.P. Andersen
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
 #include "alloc-util.h"
diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c
index 1c8c217502..56bf6a1296 100644
--- a/src/test/test-journal-importer.c
+++ b/src/test/test-journal-importer.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
index 08025a5700..b202739719 100644
--- a/src/test/test-namespace.c
+++ b/src/test/test-namespace.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <sys/socket.h>
 
diff --git a/src/test/test-nss.c b/src/test/test-nss.c
index 201c1d46fa..9e543e7557 100644
--- a/src/test/test-nss.c
+++ b/src/test/test-nss.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <dlfcn.h>
 #include <stdlib.h>
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 56deda7392..892293cb10 100644
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdlib.h>
 #include <sys/stat.h>
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 9ce467ee49..35b27bcedd 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c
index 3fd0fe3f4c..a4760b54a3 100644
--- a/src/test/test-random-util.c
+++ b/src/test/test-random-util.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "hexdecoct.h"
 #include "random-util.h"
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c
index e867030da5..6caeb843f3 100644
--- a/src/test/test-selinux.c
+++ b/src/test/test-selinux.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <sys/stat.h>
 
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 331a87ca5a..6307403e4c 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "set.h"
 
diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
index c2d5105ca6..b948db35a6 100644
--- a/src/test/test-sizeof.c
+++ b/src/test/test-sizeof.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 4a57c7ef52..944104a25a 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include "architecture.h"
 #include "automount.h"
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index 3398027c28..3817790233 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2014 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 9203532f00..09b0179fa1 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
-***/
 
 #include <fcntl.h>
 #include <stddef.h>
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 290f8c96b7..3713fa4e25 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
-  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
   Copyright © 2014 Ronny Chevalier
 ***/
 
diff --git a/src/timedate/meson.build b/src/timedate/meson.build
index 5b2b2851a9..46c7360da3 100644
--- a/src/timedate/meson.build
+++ b/src/timedate/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 if conf.get('ENABLE_TIMEDATED') == 1
         install_data('org.freedesktop.timedate1.conf',
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index 9b6ffe4bef..b79ef08277 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 systemd_timesyncd_sources = files('''
         timesyncd.c
diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index a044b3c394..a045eeeec1 100644
--- a/src/timesync/test-timesync.c
+++ b/src/timesync/test-timesync.c
@@ -1,7 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  Copyright © 2017 Zbigniew Jędrzejewski-Szmek
-***/
 
 /* Some unit tests for the helper functions in timesyncd. */
 
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index a98ef2e63d..c8d7532b72 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   Copyright © 2010 Kay Sievers
-  Copyright © 2015 Zbigniew Jędrzejewski-Szmek
 ***/
 
 #include <errno.h>
diff --git a/src/udev/meson.build b/src/udev/meson.build
index b4389a4580..3bcd2bd3d7 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 udevadm_sources = files('''
         udevadm.c
diff --git a/src/udev/udevadm-util.h b/src/udev/udevadm-util.h
index 8fa2024b79..3ae78c7bca 100644
--- a/src/udev/udevadm-util.h
+++ b/src/udev/udevadm-util.h
@@ -2,8 +2,6 @@
 #pragma once
 
 /*
- * Copyright © 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
- *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
index ddcb7f320e..03065ec26c 100644
--- a/src/vconsole/meson.build
+++ b/src/vconsole/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 if conf.get('ENABLE_VCONSOLE') == 1
         vconsole_rules = configure_file(
diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
index 27364c69ba..64f6ce942e 100644
--- a/sysctl.d/meson.build
+++ b/sysctl.d/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 install_data(
         '50-default.conf',
diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build
index 05c94cdd7b..eb99957e2f 100644
--- a/sysusers.d/meson.build
+++ b/sysusers.d/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 in_files = ['basic.conf']
 
diff --git a/test/fuzz-regressions/meson.build b/test/fuzz-regressions/meson.build
index 6f5efd5210..3a2c306492 100644
--- a/test/fuzz-regressions/meson.build
+++ b/test/fuzz-regressions/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2018 Zbigniew Jędrzejewski-Szmek
 
 sanitize_address = custom_target(
         'sanitize-address-fuzzers',
diff --git a/test/meson.build b/test/meson.build
index 37d4665902..826e684e59 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 test_data_files = '''
         a.service
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 631fbb6594..35eea2be5c 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1
 
diff --git a/tools/catalog-report.py b/tools/catalog-report.py
index cdae0f1b5a..b65869d02b 100755
--- a/tools/catalog-report.py
+++ b/tools/catalog-report.py
@@ -4,8 +4,6 @@
 #
 # This file is distributed under the MIT license, see below.
 #
-# Copyright © 2016 Zbigniew Jędrzejewski-Szmek
-#
 # The MIT License (MIT)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 9b3b96b644..cc306b8179 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright © 2012-2013 Zbigniew Jędrzejewski-Szmek
 
 import sys
 import collections
diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index 453c97842b..3c318cb75f 100755
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 # SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright © 2013 Zbigniew Jędrzejewski-Szmek
 
 import collections
 import sys
diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py
index 6f6347fe5e..42a48bc98c 100755
--- a/tools/make-man-rules.py
+++ b/tools/make-man-rules.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #  SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright © 2013, 2017 Zbigniew Jędrzejewski-Szmek
 
 from __future__ import print_function
 import collections
diff --git a/tools/xml_helper.py b/tools/xml_helper.py
index 5b5fd0a5d0..19e343b4e3 100755
--- a/tools/xml_helper.py
+++ b/tools/xml_helper.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 #  -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
 #  SPDX-License-Identifier: LGPL-2.1+
-#
-#  Copyright © 2012-2013 Zbigniew Jędrzejewski-Szmek
 
 from lxml import etree as tree
 
diff --git a/units/meson.build b/units/meson.build
index 7857304a04..77d52c1083 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 units = [
         ['basic.target',                        ''],
diff --git a/units/user/meson.build b/units/user/meson.build
index e32dcdc379..b1c2e95597 100644
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -1,6 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1+
-#
-# Copyright © 2017 Zbigniew Jędrzejewski-Szmek
 
 units = [
         'basic.target',