[elbe-devel] [PATCH 1/6] use SPDX tags in headers

Manuel Traut manut at linutronix.de
Mon Apr 9 20:12:03 CEST 2018


Instead of copying the same license info into each file,
an SPDX license list identifier [0] should be used.

This also updates the 'Copyright YYYY' line according to the file history
from git.

docs/*.txt examples/*.xml schema/* doesn't contain any license
information at the moment.

[0] https://spdx.org

Signed-off-by: Manuel Traut <manut at linutronix.de>

improve copyright statements

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 Makefile                                      |  5 ++++
 contrib/dockerfile/Makefile                   |  1 -
 contrib/dockerfile/README.md                  |  3 --
 debian/copyright                              | 28 ++++---------------
 docs/build-example-doc.sh                     |  5 ++++
 elbe                                          | 20 ++++---------
 elbepack/aptpkgutils.py                       | 19 +++----------
 elbepack/aptprogress.py                       | 18 ++----------
 elbepack/asciidoclog.py                       | 19 +++----------
 elbepack/asyncworker.py                       | 19 +++----------
 elbepack/cdroms.py                            | 20 ++++---------
 elbepack/commands/add.py                      | 17 ++---------
 elbepack/commands/adjustpkgs.py               | 18 ++----------
 elbepack/commands/bootup-check.py             | 17 ++---------
 elbepack/commands/buildchroot.py              | 20 ++++---------
 elbepack/commands/buildsdk.py                 |  4 +--
 elbepack/commands/buildsysroot.py             | 19 +++----------
 elbepack/commands/check_updates.py            | 19 +++----------
 elbepack/commands/chg_archive.py              | 17 ++---------
 elbepack/commands/chroot.py                   | 20 ++++---------
 elbepack/commands/control.py                  | 19 +++----------
 elbepack/commands/daemon.py                   | 17 ++---------
 elbepack/commands/db.py                       | 17 ++---------
 elbepack/commands/debianize.py                | 18 ++----------
 elbepack/commands/diff.py                     | 17 ++---------
 elbepack/commands/gen_update.py               | 20 ++++---------
 elbepack/commands/genlicence.py               | 18 ++----------
 elbepack/commands/get_archive.py              | 18 ++----------
 elbepack/commands/hdimg.py                    | 19 +++----------
 elbepack/commands/init.py                     | 19 +++----------
 elbepack/commands/initvm.py                   | 18 ++----------
 elbepack/commands/mkcdrom.py                  | 20 ++++---------
 elbepack/commands/parselicence.py             | 18 ++----------
 elbepack/commands/pbuilder.py                 | 18 ++----------
 elbepack/commands/pin_versions.py             | 18 ++----------
 elbepack/commands/pkgdiff.py                  | 19 +++----------
 elbepack/commands/preprocess.py               | 18 ++----------
 elbepack/commands/prjrepo.py                  | 19 +++----------
 elbepack/commands/remove_sign.py              | 22 ++-------------
 elbepack/commands/setsel.py                   | 18 ++----------
 elbepack/commands/show.py                     | 18 ++----------
 elbepack/commands/sign.py                     | 18 ++----------
 elbepack/commands/toolchainextract.py         | 18 ++----------
 elbepack/commands/updated.py                  | 20 +++----------
 elbepack/commands/validate.py                 | 18 ++----------
 elbepack/commands/xsdtoasciidoc.py            | 18 ++----------
 elbepack/config.py                            | 20 +++----------
 elbepack/daemons/soap/__init__.py             | 18 ++----------
 elbepack/daemons/soap/authentication.py       | 20 ++-----------
 elbepack/daemons/soap/datatypes.py            | 19 ++-----------
 elbepack/daemons/soap/esoap.py                | 20 ++++---------
 elbepack/daemons/soap/faults.py               | 18 ++----------
 elbepack/db.py                                | 20 ++++---------
 elbepack/dbaction.py                          | 19 +++----------
 elbepack/debianize/barebox.py                 | 18 ++----------
 elbepack/debianize/base.py                    | 19 +++----------
 elbepack/debianize/debianize.py               | 17 ++---------
 elbepack/debianize/kernel.py                  | 19 +++----------
 elbepack/debianize/uboot.py                   | 18 ++----------
 elbepack/debianreleases.py                    | 18 ++----------
 elbepack/debpkg.py                            | 18 ++----------
 elbepack/directories.py                       | 19 +++----------
 elbepack/dump.py                              | 19 +++----------
 elbepack/efilesystem.py                       | 21 ++++----------
 elbepack/elbeproject.py                       | 22 +++++----------
 elbepack/elbexml.py                           | 22 +++++----------
 elbepack/filesystem.py                        | 19 ++-----------
 elbepack/finetuning.py                        | 20 ++++---------
 elbepack/fstab.py                             | 19 +++----------
 elbepack/gpg.py                               | 19 +++----------
 elbepack/hdimg.py                             | 21 ++++----------
 elbepack/init/Makefile.mako                   | 19 +++----------
 elbepack/init/apt.conf.mako                   | 16 ++---------
 elbepack/init/init-elbe.sh.mako               | 19 +++----------
 elbepack/init/libvirt.xml.mako                |  6 ++++
 elbepack/init/preseed.cfg.mako                | 19 +++----------
 elbepack/initvmaction.py                      | 22 +++++----------
 elbepack/kvm.py                               | 19 +++----------
 elbepack/licencexml.py                        | 20 ++-----------
 .../makofiles/debianize/barebox/control.mako  |  6 ++++
 .../makofiles/debianize/barebox/format.mako   |  6 ++++
 .../makofiles/debianize/barebox/rules.mako    |  6 ++++
 .../makofiles/debianize/kernel/control.mako   |  7 +++++
 .../makofiles/debianize/kernel/format.mako    |  5 ++++
 .../makofiles/debianize/kernel/postinst.mako  |  6 ++++
 .../makofiles/debianize/kernel/postrm.mako    |  6 ++++
 .../makofiles/debianize/kernel/preinst.mako   |  6 ++++
 .../makofiles/debianize/kernel/prerm.mako     |  6 ++++
 .../makofiles/debianize/kernel/rules.mako     |  8 ++++++
 elbepack/makofiles/preferences.mako           | 19 +++----------
 elbepack/pbuilder.py                          |  7 +++++
 elbepack/pbuilderaction.py                    | 18 ++----------
 elbepack/pkgarchive.py                        | 18 ++----------
 elbepack/pkgutils.py                          | 19 +++----------
 elbepack/projectmanager.py                    | 21 ++++----------
 elbepack/repomanager.py                       | 21 ++++----------
 elbepack/rfs.py                               | 21 ++++----------
 elbepack/rpcaptcache.py                       | 20 ++++---------
 elbepack/shellhelper.py                       | 19 +++----------
 elbepack/soapclient.py                        | 20 ++++---------
 elbepack/templates.py                         | 18 ++----------
 elbepack/toolchain.py                         | 18 ++----------
 elbepack/treeutils.py                         | 18 ++----------
 elbepack/updated.py                           | 23 +++++----------
 elbepack/updated_monitors.py                  | 19 ++-----------
 elbepack/updatepkg.py                         | 18 ++----------
 elbepack/validate.py                          | 19 +++----------
 elbepack/version.py                           | 18 ++----------
 elbepack/virtapt.py                           | 20 ++++---------
 elbepack/xmldefaults.py                       |  7 +++++
 elbepack/xmlpreprocess.py                     | 18 ++----------
 elbepack/xsdtoasciidoc.mako                   |  5 ++++
 elbepack/ziparchives.py                       | 19 ++-----------
 setup.py                                      |  6 ++++
 test/updated.py                               |  6 ++++
 115 files changed, 468 insertions(+), 1439 deletions(-)

diff --git a/Makefile b/Makefile
index 14f75b46..1fd34dc1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,8 @@
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 all:
 	./test/testdeb.sh
 	dpkg-buildpackage
diff --git a/contrib/dockerfile/Makefile b/contrib/dockerfile/Makefile
index e8e60bb4..c6d5f3e8 100644
--- a/contrib/dockerfile/Makefile
+++ b/contrib/dockerfile/Makefile
@@ -1,4 +1,3 @@
-
 IMAGENAME ?= elbe-image
 CONTAINERNAME ?= elbe
 
diff --git a/contrib/dockerfile/README.md b/contrib/dockerfile/README.md
index f8ef79bf..658cd49b 100644
--- a/contrib/dockerfile/README.md
+++ b/contrib/dockerfile/README.md
@@ -1,6 +1,3 @@
-
-# Dockerfile for elbe
-
 [elbe][elb] is a debian based system to generate root-filesystems for embedded
 devices.
 
diff --git a/debian/copyright b/debian/copyright
index 38088a6e..839d360d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,30 +19,14 @@ License: GPL-2
 
 Files: *
 Copyright: (c) 2013, Torben Hohn, Linutronix GmbH, Manuel Traut, Linutronix GmbH
-License: GPL-3
+License: GPL-3+
+ SPDX-License-Identifier: GPL-3.0-or-later
+ On Debian systems, the full text of the GNU General Public
+ License version 3+ can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
 
 License: GPL-2
+ SPDX-License-Identifier: GPL-2.0-only
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-3
- 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 3 of the License, or
- (at your option) any later version.
- .
- This program 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 General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
diff --git a/docs/build-example-doc.sh b/docs/build-example-doc.sh
index 38f2dcd3..adeaa345 100755
--- a/docs/build-example-doc.sh
+++ b/docs/build-example-doc.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2013, 2015-2017 Manuel Traut <manut at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 FILES=`ls -1 ../examples`
 DEST=elbe-examples.tmp
diff --git a/elbe b/elbe
index 33068e99..9c65f9be 100755
--- a/elbe
+++ b/elbe
@@ -1,22 +1,12 @@
 #!/usr/bin/env python2
 #
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/aptpkgutils.py b/elbepack/aptpkgutils.py
index 0fa00fbf..ba49853e 100644
--- a/elbepack/aptpkgutils.py
+++ b/elbepack/aptpkgutils.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 MARKED_INSTALL = 0
 MARKED_UPGRADE = 1
diff --git a/elbepack/aptprogress.py b/elbepack/aptprogress.py
index 85b743b6..1d36437c 100644
--- a/elbepack/aptprogress.py
+++ b/elbepack/aptprogress.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/asciidoclog.py b/elbepack/asciidoclog.py
index db9e5dcf..4912253a 100644
--- a/elbepack/asciidoclog.py
+++ b/elbepack/asciidoclog.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import sys
diff --git a/elbepack/asyncworker.py b/elbepack/asyncworker.py
index d7dfc725..596e766a 100644
--- a/elbepack/asyncworker.py
+++ b/elbepack/asyncworker.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2015-2018 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from threading import Thread
 from Queue import Queue
diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 9b8b7890..37eb8a36 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
diff --git a/elbepack/commands/add.py b/elbepack/commands/add.py
index 3c041bcc..0aa192f3 100644
--- a/elbepack/commands/add.py
+++ b/elbepack/commands/add.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/adjustpkgs.py b/elbepack/commands/adjustpkgs.py
index 9ec67147..0e8a560b 100644
--- a/elbepack/commands/adjustpkgs.py
+++ b/elbepack/commands/adjustpkgs.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/bootup-check.py b/elbepack/commands/bootup-check.py
index 55f6be4c..23985a91 100644
--- a/elbepack/commands/bootup-check.py
+++ b/elbepack/commands/bootup-check.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/buildchroot.py b/elbepack/commands/buildchroot.py
index 871708a3..ca243c1d 100644
--- a/elbepack/commands/buildchroot.py
+++ b/elbepack/commands/buildchroot.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2013-2014, 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/buildsdk.py b/elbepack/commands/buildsdk.py
index 4092edb6..5b4debfc 100644
--- a/elbepack/commands/buildsdk.py
+++ b/elbepack/commands/buildsdk.py
@@ -1,7 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2015  Linutronix GmbH
+# Copyright (c) 2017-2018 Manuel Traut <manut at linutronix.de>
 #
-# SPDX-License-Identifier: GPL-3.0
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/buildsysroot.py b/elbepack/commands/buildsysroot.py
index 6af23e84..3dc8e38a 100644
--- a/elbepack/commands/buildsysroot.py
+++ b/elbepack/commands/buildsysroot.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/check_updates.py b/elbepack/commands/check_updates.py
index 410f8fec..e250041d 100644
--- a/elbepack/commands/check_updates.py
+++ b/elbepack/commands/check_updates.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2013-2014, 2017-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Holger Dengler <dengler at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/chg_archive.py b/elbepack/commands/chg_archive.py
index 754084f8..90cc9732 100644
--- a/elbepack/commands/chg_archive.py
+++ b/elbepack/commands/chg_archive.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/chroot.py b/elbepack/commands/chroot.py
index 578b8ccd..7529fcf7 100644
--- a/elbepack/commands/chroot.py
+++ b/elbepack/commands/chroot.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/control.py b/elbepack/commands/control.py
index 9fa6eae9..39349f98 100644
--- a/elbepack/commands/control.py
+++ b/elbepack/commands/control.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014,2017 Linutronix GmbH
+# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/daemon.py b/elbepack/commands/daemon.py
index 479c3c03..f8530a93 100644
--- a/elbepack/commands/daemon.py
+++ b/elbepack/commands/daemon.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/db.py b/elbepack/commands/db.py
index c2fd600a..2faa534c 100644
--- a/elbepack/commands/db.py
+++ b/elbepack/commands/db.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/debianize.py b/elbepack/commands/debianize.py
index 96298a32..3520f2ff 100644
--- a/elbepack/commands/debianize.py
+++ b/elbepack/commands/debianize.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/diff.py b/elbepack/commands/diff.py
index 38f3cad6..63cc0055 100644
--- a/elbepack/commands/diff.py
+++ b/elbepack/commands/diff.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/gen_update.py b/elbepack/commands/gen_update.py
index 9496c0fc..b5f31bc6 100644
--- a/elbepack/commands/gen_update.py
+++ b/elbepack/commands/gen_update.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/genlicence.py b/elbepack/commands/genlicence.py
index 2d70a717..e41cac25 100644
--- a/elbepack/commands/genlicence.py
+++ b/elbepack/commands/genlicence.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/get_archive.py b/elbepack/commands/get_archive.py
index 59604c7c..796a76ab 100644
--- a/elbepack/commands/get_archive.py
+++ b/elbepack/commands/get_archive.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/hdimg.py b/elbepack/commands/hdimg.py
index a52ec49c..85111b5c 100644
--- a/elbepack/commands/hdimg.py
+++ b/elbepack/commands/hdimg.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2012-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
index fb723abd..9a597170 100644
--- a/elbepack/commands/init.py
+++ b/elbepack/commands/init.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015, 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/initvm.py b/elbepack/commands/initvm.py
index 86e66728..c85d8a79 100644
--- a/elbepack/commands/initvm.py
+++ b/elbepack/commands/initvm.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015, 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/mkcdrom.py b/elbepack/commands/mkcdrom.py
index eb96e493..9eae9187 100644
--- a/elbepack/commands/mkcdrom.py
+++ b/elbepack/commands/mkcdrom.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
+# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/parselicence.py b/elbepack/commands/parselicence.py
index 1fb70a39..e3b27e76 100644
--- a/elbepack/commands/parselicence.py
+++ b/elbepack/commands/parselicence.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/pbuilder.py b/elbepack/commands/pbuilder.py
index c2ff6583..d3adb48a 100644
--- a/elbepack/commands/pbuilder.py
+++ b/elbepack/commands/pbuilder.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/pin_versions.py b/elbepack/commands/pin_versions.py
index 5422f178..cfbd68e4 100644
--- a/elbepack/commands/pin_versions.py
+++ b/elbepack/commands/pin_versions.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/pkgdiff.py b/elbepack/commands/pkgdiff.py
index 5dbfc84f..c89c0900 100644
--- a/elbepack/commands/pkgdiff.py
+++ b/elbepack/commands/pkgdiff.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/preprocess.py b/elbepack/commands/preprocess.py
index 7b2be1f9..73fc71cb 100644
--- a/elbepack/commands/preprocess.py
+++ b/elbepack/commands/preprocess.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2017  Linutronix GmbH
+# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/prjrepo.py b/elbepack/commands/prjrepo.py
index 6062d95c..a1819ee0 100644
--- a/elbepack/commands/prjrepo.py
+++ b/elbepack/commands/prjrepo.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2017  Linutronix GmbH
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/remove_sign.py b/elbepack/commands/remove_sign.py
index de85a3ab..918cc32a 100644
--- a/elbepack/commands/remove_sign.py
+++ b/elbepack/commands/remove_sign.py
@@ -1,24 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please note that to get VALID (Trusted), the key that the file was signed
-# with has to have ultimate trust level, otherwise you'll only get
-# VALID (Untrusted)!
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/setsel.py b/elbepack/commands/setsel.py
index c44a0efa..467582b0 100644
--- a/elbepack/commands/setsel.py
+++ b/elbepack/commands/setsel.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/show.py b/elbepack/commands/show.py
index d4c5dac7..6627fd5c 100644
--- a/elbepack/commands/show.py
+++ b/elbepack/commands/show.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/sign.py b/elbepack/commands/sign.py
index 5f32664a..538f22a6 100644
--- a/elbepack/commands/sign.py
+++ b/elbepack/commands/sign.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/toolchainextract.py b/elbepack/commands/toolchainextract.py
index c60b606c..dcc82dab 100644
--- a/elbepack/commands/toolchainextract.py
+++ b/elbepack/commands/toolchainextract.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from optparse import OptionParser
 from tempfile import mkdtemp
diff --git a/elbepack/commands/updated.py b/elbepack/commands/updated.py
index 212ae37f..38fc3a9a 100644
--- a/elbepack/commands/updated.py
+++ b/elbepack/commands/updated.py
@@ -1,21 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
-# Copyright (C) 2015  emtrion GmbH
+# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import signal
diff --git a/elbepack/commands/validate.py b/elbepack/commands/validate.py
index cad497fc..75ecca2f 100644
--- a/elbepack/commands/validate.py
+++ b/elbepack/commands/validate.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/commands/xsdtoasciidoc.py b/elbepack/commands/xsdtoasciidoc.py
index 639f1ba5..547fa3d5 100644
--- a/elbepack/commands/xsdtoasciidoc.py
+++ b/elbepack/commands/xsdtoasciidoc.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/config.py b/elbepack/config.py
index 37e1ee18..a2184361 100644
--- a/elbepack/config.py
+++ b/elbepack/config.py
@@ -1,21 +1,9 @@
-#
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014,2017 Linutronix GmbH
-#
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
diff --git a/elbepack/daemons/soap/__init__.py b/elbepack/daemons/soap/__init__.py
index c53b959f..48818cf9 100644
--- a/elbepack/daemons/soap/__init__.py
+++ b/elbepack/daemons/soap/__init__.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/daemons/soap/authentication.py b/elbepack/daemons/soap/authentication.py
index 787cab3c..210639aa 100644
--- a/elbepack/daemons/soap/authentication.py
+++ b/elbepack/daemons/soap/authentication.py
@@ -1,22 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from faults import SoapElbeNotLoggedIn, SoapElbeNotAuthorized
 from functools import wraps
diff --git a/elbepack/daemons/soap/datatypes.py b/elbepack/daemons/soap/datatypes.py
index 8c11dd38..159bf8c9 100644
--- a/elbepack/daemons/soap/datatypes.py
+++ b/elbepack/daemons/soap/datatypes.py
@@ -1,21 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from spyne.model.complex import ComplexModel
 from spyne.model.primitive import Unicode, DateTime
diff --git a/elbepack/daemons/soap/esoap.py b/elbepack/daemons/soap/esoap.py
index 03fcffc4..fb071da8 100644
--- a/elbepack/daemons/soap/esoap.py
+++ b/elbepack/daemons/soap/esoap.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2016 Claudius Heine <ch at denx.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/daemons/soap/faults.py b/elbepack/daemons/soap/faults.py
index c17d5a52..f2409d92 100644
--- a/elbepack/daemons/soap/faults.py
+++ b/elbepack/daemons/soap/faults.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from spyne.model.fault import Fault
 from traceback import format_exc
diff --git a/elbepack/db.py b/elbepack/db.py
index b55ff09f..9f6c0f29 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/dbaction.py b/elbepack/dbaction.py
index ff32b1f6..a318f309 100644
--- a/elbepack/dbaction.py
+++ b/elbepack/dbaction.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/debianize/barebox.py b/elbepack/debianize/barebox.py
index 76c2344b..766c2dc9 100644
--- a/elbepack/debianize/barebox.py
+++ b/elbepack/debianize/barebox.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
diff --git a/elbepack/debianize/base.py b/elbepack/debianize/base.py
index 38c5a8cc..7d9d6781 100644
--- a/elbepack/debianize/base.py
+++ b/elbepack/debianize/base.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Martin Kaistra <martin.kaistra at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import sys
diff --git a/elbepack/debianize/debianize.py b/elbepack/debianize/debianize.py
index f7f0dd92..b18a8e32 100644
--- a/elbepack/debianize/debianize.py
+++ b/elbepack/debianize/debianize.py
@@ -1,20 +1,7 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from npyscreen import NPSAppManaged
 
diff --git a/elbepack/debianize/kernel.py b/elbepack/debianize/kernel.py
index 91906069..74d82ec7 100644
--- a/elbepack/debianize/kernel.py
+++ b/elbepack/debianize/kernel.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
diff --git a/elbepack/debianize/uboot.py b/elbepack/debianize/uboot.py
index fd7d415f..ea2fc805 100644
--- a/elbepack/debianize/uboot.py
+++ b/elbepack/debianize/uboot.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import sys
 
diff --git a/elbepack/debianreleases.py b/elbepack/debianreleases.py
index 733e46b7..7e5ff531 100644
--- a/elbepack/debianreleases.py
+++ b/elbepack/debianreleases.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 suite2codename = {'oldoldoldstable': 'squeeze',
                   'oldoldstable': 'wheezy',
diff --git a/elbepack/debpkg.py b/elbepack/debpkg.py
index df505a28..0118d73b 100644
--- a/elbepack/debpkg.py
+++ b/elbepack/debpkg.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import string
diff --git a/elbepack/directories.py b/elbepack/directories.py
index f23b1560..04ffb30a 100644
--- a/elbepack/directories.py
+++ b/elbepack/directories.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2015  Linutronix GmbH
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import elbepack
 import os
diff --git a/elbepack/dump.py b/elbepack/dump.py
index 0cd31882..cd2aa490 100644
--- a/elbepack/dump.py
+++ b/elbepack/dump.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from elbepack.asciidoclog import ASCIIDocLog
 from datetime import datetime
diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
index a2781b5f..b75207a4 100644
--- a/elbepack/efilesystem.py
+++ b/elbepack/efilesystem.py
@@ -1,21 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
-#
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
 #
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import time
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index f6a92ce2..7ec1887d 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -1,20 +1,12 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2016-2018 John Ogness <jogness at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import datetime
diff --git a/elbepack/elbexml.py b/elbepack/elbexml.py
index 7fd622dc..cf117dc6 100644
--- a/elbepack/elbexml.py
+++ b/elbepack/elbexml.py
@@ -1,20 +1,12 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2015 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+# Copyright (c) 2015 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from elbepack.treeutils import etree
 from elbepack.validate import validate_xml
diff --git a/elbepack/filesystem.py b/elbepack/filesystem.py
index 47b74cba..f0a1a9ec 100644
--- a/elbepack/filesystem.py
+++ b/elbepack/filesystem.py
@@ -1,21 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
-#
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
 #
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import shutil
diff --git a/elbepack/finetuning.py b/elbepack/finetuning.py
index eba35068..9daa7964 100644
--- a/elbepack/finetuning.py
+++ b/elbepack/finetuning.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/fstab.py b/elbepack/fstab.py
index 1e7307cc..ed0a10a0 100644
--- a/elbepack/fstab.py
+++ b/elbepack/fstab.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014, 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2015 Matthias Buehler <matthias.buehler at de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
diff --git a/elbepack/gpg.py b/elbepack/gpg.py
index c6b1d44b..b55d658b 100644
--- a/elbepack/gpg.py
+++ b/elbepack/gpg.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/hdimg.py b/elbepack/hdimg.py
index b3810e7f..3f1dfd9a 100644
--- a/elbepack/hdimg.py
+++ b/elbepack/hdimg.py
@@ -1,20 +1,11 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015, 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016, 2018 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2016 Philipp Rosenberger <p.rosenberger at linutronix.de>
+# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index 4ccafd57..c4f79574 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -1,20 +1,9 @@
 ## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Lukasz Walewski <lwalewski at s-can.at>
 ##
-## This file is part of ELBE.
-##
-## ELBE 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 3 of the License, or
-## (at your option) any later version.
-##
-## ELBE 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: GPL-3.0-or-later
 ##
 MEMSIZE?=1024
 SMP?=`nproc`
diff --git a/elbepack/init/apt.conf.mako b/elbepack/init/apt.conf.mako
index eb0ab532..7f923f3f 100644
--- a/elbepack/init/apt.conf.mako
+++ b/elbepack/init/apt.conf.mako
@@ -1,20 +1,8 @@
 ## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 ##
-## This file is part of ELBE.
+## SPDX-License-Identifier: GPL-3.0-or-later
 ##
-## ELBE 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 3 of the License, or
-## (at your option) any later version.
-##
-## ELBE 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
 %if http_proxy:
 Acquire {
 	http {
diff --git a/elbepack/init/init-elbe.sh.mako b/elbepack/init/init-elbe.sh.mako
index 74b2523a..eb69a898 100644
--- a/elbepack/init/init-elbe.sh.mako
+++ b/elbepack/init/init-elbe.sh.mako
@@ -1,20 +1,9 @@
 ## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
 ##
-## This file is part of ELBE.
-##
-## ELBE 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 3 of the License, or
-## (at your option) any later version.
-##
-## ELBE 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: GPL-3.0-or-later
 ##
 #! /bin/sh
 
diff --git a/elbepack/init/libvirt.xml.mako b/elbepack/init/libvirt.xml.mako
index 13c9b82c..18f482e8 100644
--- a/elbepack/init/libvirt.xml.mako
+++ b/elbepack/init/libvirt.xml.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 <%
 # TODO: Add dynamic name support
 # TODO: Relativ file path for diskimage
diff --git a/elbepack/init/preseed.cfg.mako b/elbepack/init/preseed.cfg.mako
index b20db501..1751fc1f 100644
--- a/elbepack/init/preseed.cfg.mako
+++ b/elbepack/init/preseed.cfg.mako
@@ -1,21 +1,10 @@
 ## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 ##
-## This file is part of ELBE.
+## SPDX-License-Identifier: GPL-3.0-or-later
 ##
-## ELBE 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 3 of the License, or
-## (at your option) any later version.
-##
-## ELBE 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
 d-i keyboard-configuration/layoutcode string us
 d-i keyboard-configuration/xkb-keymap select us
 
diff --git a/elbepack/initvmaction.py b/elbepack/initvmaction.py
index 02059358..b3ec427a 100644
--- a/elbepack/initvmaction.py
+++ b/elbepack/initvmaction.py
@@ -1,20 +1,12 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2015 Silvio Fricke <silvio.fricke at gmail.com>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
+# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/kvm.py b/elbepack/kvm.py
index ca906b7f..2b67d5c5 100644
--- a/elbepack/kvm.py
+++ b/elbepack/kvm.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import subprocess
diff --git a/elbepack/licencexml.py b/elbepack/licencexml.py
index 76c397cb..5a346472 100644
--- a/elbepack/licencexml.py
+++ b/elbepack/licencexml.py
@@ -1,22 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-#
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from elbepack.treeutils import etree
 from debian.copyright import Copyright, LicenseParagraph
diff --git a/elbepack/makofiles/debianize/barebox/control.mako b/elbepack/makofiles/debianize/barebox/control.mako
index 62077162..597fc8a9 100644
--- a/elbepack/makofiles/debianize/barebox/control.mako
+++ b/elbepack/makofiles/debianize/barebox/control.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 Source: barebox-${p_name}-${k_version}
 Section: admin
 Priority: optional
diff --git a/elbepack/makofiles/debianize/barebox/format.mako b/elbepack/makofiles/debianize/barebox/format.mako
index 7b6bf9be..34f5af8d 100644
--- a/elbepack/makofiles/debianize/barebox/format.mako
+++ b/elbepack/makofiles/debianize/barebox/format.mako
@@ -1 +1,7 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 3.0 (${source_format})
diff --git a/elbepack/makofiles/debianize/barebox/rules.mako b/elbepack/makofiles/debianize/barebox/rules.mako
index 353a29fc..322d45fc 100755
--- a/elbepack/makofiles/debianize/barebox/rules.mako
+++ b/elbepack/makofiles/debianize/barebox/rules.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/usr/bin/make -f
 
 BOOT_PATH=`pwd`/debian/tmp/boot
diff --git a/elbepack/makofiles/debianize/kernel/control.mako b/elbepack/makofiles/debianize/kernel/control.mako
index 9e69fc16..9702a986 100644
--- a/elbepack/makofiles/debianize/kernel/control.mako
+++ b/elbepack/makofiles/debianize/kernel/control.mako
@@ -1,3 +1,10 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 Source: linux-${p_name}-${k_version}
 Section: kernel
 Priority: optional
diff --git a/elbepack/makofiles/debianize/kernel/format.mako b/elbepack/makofiles/debianize/kernel/format.mako
index 7b6bf9be..bbefce21 100644
--- a/elbepack/makofiles/debianize/kernel/format.mako
+++ b/elbepack/makofiles/debianize/kernel/format.mako
@@ -1 +1,6 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 3.0 (${source_format})
diff --git a/elbepack/makofiles/debianize/kernel/postinst.mako b/elbepack/makofiles/debianize/kernel/postinst.mako
index c2b43b79..ce5eb032 100755
--- a/elbepack/makofiles/debianize/kernel/postinst.mako
+++ b/elbepack/makofiles/debianize/kernel/postinst.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/bin/sh
 
 set -e
diff --git a/elbepack/makofiles/debianize/kernel/postrm.mako b/elbepack/makofiles/debianize/kernel/postrm.mako
index 252fc3c0..69bbd3d6 100755
--- a/elbepack/makofiles/debianize/kernel/postrm.mako
+++ b/elbepack/makofiles/debianize/kernel/postrm.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/bin/sh
 
 set -e
diff --git a/elbepack/makofiles/debianize/kernel/preinst.mako b/elbepack/makofiles/debianize/kernel/preinst.mako
index bff9cd26..af53f87c 100755
--- a/elbepack/makofiles/debianize/kernel/preinst.mako
+++ b/elbepack/makofiles/debianize/kernel/preinst.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/bin/sh
 
 set -e
diff --git a/elbepack/makofiles/debianize/kernel/prerm.mako b/elbepack/makofiles/debianize/kernel/prerm.mako
index a5edf4bc..15498725 100755
--- a/elbepack/makofiles/debianize/kernel/prerm.mako
+++ b/elbepack/makofiles/debianize/kernel/prerm.mako
@@ -1,3 +1,9 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/bin/sh
 
 set -e
diff --git a/elbepack/makofiles/debianize/kernel/rules.mako b/elbepack/makofiles/debianize/kernel/rules.mako
index 54c1645f..f0f4d880 100755
--- a/elbepack/makofiles/debianize/kernel/rules.mako
+++ b/elbepack/makofiles/debianize/kernel/rules.mako
@@ -1,3 +1,11 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Martin Kaistra <martin.kaistra at linutronix.de>
+# Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+##
 #!/usr/bin/make -f
 
 PWD:=$(shell pwd)
diff --git a/elbepack/makofiles/preferences.mako b/elbepack/makofiles/preferences.mako
index 3c698da5..ca1f5255 100644
--- a/elbepack/makofiles/preferences.mako
+++ b/elbepack/makofiles/preferences.mako
@@ -1,20 +1,9 @@
 ## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
 ##
-## This file is part of ELBE.
-##
-## ELBE 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 3 of the License, or
-## (at your option) any later version.
-##
-## ELBE 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 General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+## SPDX-License-Identifier: GPL-3.0-or-later
 ##
 <%!
     import textwrap
diff --git a/elbepack/pbuilder.py b/elbepack/pbuilder.py
index 316a81ef..a3bf4c72 100644
--- a/elbepack/pbuilder.py
+++ b/elbepack/pbuilder.py
@@ -1,3 +1,10 @@
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2015-2017 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import urllib2
diff --git a/elbepack/pbuilderaction.py b/elbepack/pbuilderaction.py
index cf262841..7806b945 100644
--- a/elbepack/pbuilderaction.py
+++ b/elbepack/pbuilderaction.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
index 084c339c..a34e67b4 100644
--- a/elbepack/pkgarchive.py
+++ b/elbepack/pkgarchive.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import errno
 from os import path, remove
diff --git a/elbepack/pkgutils.py b/elbepack/pkgutils.py
index 563935e0..81ed9d96 100644
--- a/elbepack/pkgutils.py
+++ b/elbepack/pkgutils.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2015, 2017-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/projectmanager.py b/elbepack/projectmanager.py
index 14da0c1b..e30942ab 100644
--- a/elbepack/projectmanager.py
+++ b/elbepack/projectmanager.py
@@ -1,21 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import errno
 import os
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index f706c0b2..f72b8e3c 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -1,20 +1,11 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
+# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import shutil
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 4aede388..cfee1a17 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -1,20 +1,11 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import urlparse
diff --git a/elbepack/rpcaptcache.py b/elbepack/rpcaptcache.py
index 8577abed..d7601558 100644
--- a/elbepack/rpcaptcache.py
+++ b/elbepack/rpcaptcache.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Markus Kreidl <mkreidl at linutronix.de>
+# Copyright (c) 2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from multiprocessing.util import Finalize
 from apt_pkg import config, version_compare
diff --git a/elbepack/shellhelper.py b/elbepack/shellhelper.py
index d994eee2..4ff6ad02 100644
--- a/elbepack/shellhelper.py
+++ b/elbepack/shellhelper.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 from subprocess import Popen, PIPE, STDOUT
diff --git a/elbepack/soapclient.py b/elbepack/soapclient.py
index f1fcf28f..43c43600 100644
--- a/elbepack/soapclient.py
+++ b/elbepack/soapclient.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2016 Claudius Heine <ch at denx.de>
+# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/templates.py b/elbepack/templates.py
index 6fdbbf53..8552595c 100644
--- a/elbepack/templates.py
+++ b/elbepack/templates.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/toolchain.py b/elbepack/toolchain.py
index cfcbb1fa..18fa2507 100644
--- a/elbepack/toolchain.py
+++ b/elbepack/toolchain.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import string
 import glob
diff --git a/elbepack/treeutils.py b/elbepack/treeutils.py
index 156c7945..6a2b5ac9 100644
--- a/elbepack/treeutils.py
+++ b/elbepack/treeutils.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/updated.py b/elbepack/updated.py
index 7f8dcaf4..e914a90d 100644
--- a/elbepack/updated.py
+++ b/elbepack/updated.py
@@ -1,21 +1,12 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2015 emtrion GmbH
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/updated_monitors.py b/elbepack/updated_monitors.py
index c8a6fc3e..9d4ecfb6 100644
--- a/elbepack/updated_monitors.py
+++ b/elbepack/updated_monitors.py
@@ -1,21 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2015 emtrion GmbH
-# Copyright (C) 2014  Linutronix GmbH
+# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
+# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import threading
diff --git a/elbepack/updatepkg.py b/elbepack/updatepkg.py
index 6427395e..6ced00a2 100644
--- a/elbepack/updatepkg.py
+++ b/elbepack/updatepkg.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013, 2014  Linutronix GmbH
+# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
+# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/validate.py b/elbepack/validate.py
index 355af848..c5604372 100644
--- a/elbepack/validate.py
+++ b/elbepack/validate.py
@@ -1,20 +1,9 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import sys
 from lxml import etree
diff --git a/elbepack/version.py b/elbepack/version.py
index bad29de3..5d8db899 100644
--- a/elbepack/version.py
+++ b/elbepack/version.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2016  Linutronix GmbH
+# Copyright (c) 2013, 2017-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from elbepack.directories import pack_dir
 from platform import linux_distribution
diff --git a/elbepack/virtapt.py b/elbepack/virtapt.py
index db5e7668..fd3149ba 100644
--- a/elbepack/virtapt.py
+++ b/elbepack/virtapt.py
@@ -1,20 +1,10 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2013-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014-2015, 2018 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2018 John Ogness <john.ogness at linutronix.de>
+# Copyright (c) 2018 Oliver Brandt <oliver.brandt at lenze.com>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/xmldefaults.py b/elbepack/xmldefaults.py
index 4ac7de92..5b438d2b 100644
--- a/elbepack/xmldefaults.py
+++ b/elbepack/xmldefaults.py
@@ -1,3 +1,10 @@
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2013-2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
+# Copyright (c) 2014, 2017-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+# Copyright (c) 2016 Anna-Maria Gleixner <anna-maria at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
diff --git a/elbepack/xmlpreprocess.py b/elbepack/xmlpreprocess.py
index d24f0801..7b5a5488 100644
--- a/elbepack/xmlpreprocess.py
+++ b/elbepack/xmlpreprocess.py
@@ -1,20 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2017  Linutronix GmbH
+# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
+# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import sys
 import re
diff --git a/elbepack/xsdtoasciidoc.mako b/elbepack/xsdtoasciidoc.mako
index c2073bab..fd7fbfc1 100644
--- a/elbepack/xsdtoasciidoc.mako
+++ b/elbepack/xsdtoasciidoc.mako
@@ -1,3 +1,8 @@
+## ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
+##
+## SPDX-License-Identifier: GPL-3.0-or-later
+
 <%
 import string
 ELEM = "{http://www.w3.org/2001/XMLSchema}element"
diff --git a/elbepack/ziparchives.py b/elbepack/ziparchives.py
index 8d5cc1ab..e2b74e27 100644
--- a/elbepack/ziparchives.py
+++ b/elbepack/ziparchives.py
@@ -1,21 +1,8 @@
 # ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (C) 2013  Linutronix GmbH
+# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
 #
-# This file is part of ELBE.
-#
-# ELBE 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 3 of the License, or
-# (at your option) any later version.
-#
-# ELBE 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
-
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
 import os
diff --git a/setup.py b/setup.py
index 67452e6d..3cc01f22 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,10 @@
 #!/usr/bin/env python3
+#
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2013, 2017-2018 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import subprocess
 import os
diff --git a/test/updated.py b/test/updated.py
index f2476698..ca74bc46 100755
--- a/test/updated.py
+++ b/test/updated.py
@@ -1,4 +1,10 @@
 #!/usr/bin/env python2
+#
+# ELBE - Debian Based Embedded Rootfilesystem Builder
+# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
+# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import print_function
 
-- 
2.17.0




More information about the elbe-devel mailing list