diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index c2487c9ef2..a823a95e70 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2016 Zeal Jagannatha
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 1a3b517d0f..a93eb7b539 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2016 Daniel Rusek
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index f54cbe08f3..4d7168c00b 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2016 Lennart Poettering
diff --git a/catalog/meson.build b/catalog/meson.build
index 3e61e6fc5b..baebd45ea4 100644
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 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
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see .
+
in_files = '''
systemd.bg.catalog
systemd.be.catalog
diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in
index 5b1cdf2492..28de086be7 100644
--- a/catalog/systemd.be.catalog.in
+++ b/catalog/systemd.be.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in
index 764432c0dc..dc5f9b731f 100644
--- a/catalog/systemd.be@latin.catalog.in
+++ b/catalog/systemd.be@latin.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in
index 4b6cf118be..202b192b30 100644
--- a/catalog/systemd.bg.catalog.in
+++ b/catalog/systemd.bg.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 1efa021fdc..c637af7ca2 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.da.catalog.in b/catalog/systemd.da.catalog.in
index a5570f47d5..69446fb7f0 100644
--- a/catalog/systemd.da.catalog.in
+++ b/catalog/systemd.da.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.de.catalog.in b/catalog/systemd.de.catalog.in
index b69a8be198..8fdedafc09 100644
--- a/catalog/systemd.de.catalog.in
+++ b/catalog/systemd.de.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in
index d9fa58fff0..36c87147a7 100644
--- a/catalog/systemd.fr.catalog.in
+++ b/catalog/systemd.fr.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in
index d30e955e28..f6e238e7c1 100644
--- a/catalog/systemd.hr.catalog.in
+++ b/catalog/systemd.hr.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in
index 23c1cd44db..9f5e87893b 100644
--- a/catalog/systemd.hu.catalog.in
+++ b/catalog/systemd.hu.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.it.catalog.in b/catalog/systemd.it.catalog.in
index 208ac2bfdc..df1e225eaf 100644
--- a/catalog/systemd.it.catalog.in
+++ b/catalog/systemd.it.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2013 Daniele Medri
diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in
index 4e8d7008c3..e57818081d 100644
--- a/catalog/systemd.ko.catalog.in
+++ b/catalog/systemd.ko.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in
index 278b699e26..3641db2e66 100644
--- a/catalog/systemd.pl.catalog.in
+++ b/catalog/systemd.pl.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in
index 192fd33c1c..6a30dd3e10 100644
--- a/catalog/systemd.pt_BR.catalog.in
+++ b/catalog/systemd.pt_BR.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in
index b04c78dc24..25ee6acfba 100644
--- a/catalog/systemd.ru.catalog.in
+++ b/catalog/systemd.ru.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in
index 674eb557b5..1d494ffce2 100644
--- a/catalog/systemd.sr.catalog.in
+++ b/catalog/systemd.sr.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in
index 78a8a8ca62..92e32200de 100644
--- a/catalog/systemd.zh_CN.catalog.in
+++ b/catalog/systemd.zh_CN.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in
index d262b88a01..66db58d162 100644
--- a/catalog/systemd.zh_TW.catalog.in
+++ b/catalog/systemd.zh_TW.catalog.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
# This file is part of systemd.
#
# Copyright 2012 Lennart Poettering
diff --git a/docs/sysvinit/meson.build b/docs/sysvinit/meson.build
index 115ad39ce2..5c1aa4cc20 100644
--- a/docs/sysvinit/meson.build
+++ b/docs/sysvinit/meson.build
@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 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
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see .
+
file = configure_file(
input : 'README.in',
output : 'README',
diff --git a/docs/var-log/meson.build b/docs/var-log/meson.build
index 60acf494ef..fc14c0405e 100644
--- a/docs/var-log/meson.build
+++ b/docs/var-log/meson.build
@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 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
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see .
+
file = configure_file(
input : 'README.in',
output : 'README',
diff --git a/hwdb/meson.build b/hwdb/meson.build
index a5175039cd..d333ee68a3 100644
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 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
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see .
+
hwdb_files = files('''
20-pci-vendor-model.hwdb
20-pci-classes.hwdb
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index eb52dc917b..f4cc9c6974 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
# -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
+# SPDX-License-Identifier: MIT
#
# This file is part of systemd. It is distrubuted under the MIT license, see
# below.
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 5b63cfb4c3..5f55cb4db2 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -2,6 +2,8 @@
+
hwdb
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index f7ac8c46e0..ed49c39f35 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -3,6 +3,8 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
Environment
diff --git a/man/libsystemd-pkgconfig.xml b/man/libsystemd-pkgconfig.xml
index 272da64cd7..b98f60922a 100644
--- a/man/libsystemd-pkgconfig.xml
+++ b/man/libsystemd-pkgconfig.xml
@@ -2,6 +2,27 @@
+
+
Notes
diff --git a/man/libudev.xml b/man/libudev.xml
index 53b68dcc89..e92db55759 100644
--- a/man/libudev.xml
+++ b/man/libudev.xml
@@ -6,6 +6,8 @@
]>
+
Configuration Directories and Precedence
diff --git a/man/standard-options.xml b/man/standard-options.xml
index f718451a1b..dcc6bb89ae 100644
--- a/man/standard-options.xml
+++ b/man/standard-options.xml
@@ -2,6 +2,27 @@
+
+
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index ccf6c8e39f..ec69b4c5bb 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -1,6 +1,8 @@
+
systemd-hwdb
diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml
index 70a618ce46..9fd36bb3b3 100644
--- a/man/systemd-importd.service.xml
+++ b/man/systemd-importd.service.xml
@@ -3,6 +3,8 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index a2dad39f01..b0dd56fdff 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -2,6 +2,8 @@
+
udev
diff --git a/man/udev_device_get_syspath.xml b/man/udev_device_get_syspath.xml
index 014f43b21c..1eb029f8f9 100644
--- a/man/udev_device_get_syspath.xml
+++ b/man/udev_device_get_syspath.xml
@@ -6,6 +6,8 @@
]>
+
udevadm
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 8616c54249..d6a5eeffb7 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -2,6 +2,28 @@
+
+
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index 4a6672cbae..fecbfd82bc 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -3,6 +3,8 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">