Index: .reuse/dep5
===================================================================
--- .reuse/dep5	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ .reuse/dep5	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -4,5 +4,5 @@
 Source: helenos.org
 
-# Directories with grub artifacts
+# Directories with bootloader artifacts
 
 Files: boot/grub/*
@@ -10,2 +10,9 @@
 License: GPL-3.0-only
 
+Files: boot/silo/*
+Copyright: 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>
+License: GPL-2.0-only
+
+Files: boot/yaboot/*
+Copyright: 2000-2003 Ethan Benson
+License: GPL-2.0-only
Index: LICENSES/LicenseRef-InflateLicense.txt
===================================================================
--- LICENSES/LicenseRef-InflateLicense.txt	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ LICENSES/LicenseRef-InflateLicense.txt	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,4 +1,4 @@
 This is the original copyright/license notice of code
-included in boot/generic/src/inflate.c
+included in boot/generic/src/inflate.c and uspace/lib/compress/inflate.c
 
   Copyright (C) 2002-2010 Mark Adler, all rights reserved
Index: kernel/generic/src/lib/ubsan.c
===================================================================
--- kernel/generic/src/lib/ubsan.c	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ kernel/generic/src/lib/ubsan.c	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: BSD-2-Clause
 /*
- * Copyright (c) 2016, Linaro Limited
+ * SPDX-FileCopyrightText: 2016 Linaro Limited
+ * SPDX-FileCopyrightText: 2018 Jiří Zárevúcky
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
-
-/* Modified for HelenOS use by Jiří Zárevúcky. */
 
 #include <stdbool.h>
Index: tools/checkers/stanse/ThreadChecker.xml
===================================================================
--- tools/checkers/stanse/ThreadChecker.xml	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ tools/checkers/stanse/ThreadChecker.xml	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-
- Copyright (c) 2009 Martin Decky
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- - The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+ SPDX-FileCopyrightText: 2009 Martin Decky
+ SPDX-License-Identifier: BSD-3-Clause
 -->
 
Index: uspace/lib/c/generic/ubsan.c
===================================================================
--- uspace/lib/c/generic/ubsan.c	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ uspace/lib/c/generic/ubsan.c	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,8 +1,8 @@
-// SPDX-License-Identifier: BSD-2-Clause
 /*
- * Copyright (c) 2016, Linaro Limited
+ * SPDX-FileCopyrightText: 2016 Linaro Limited
+ * SPDX-FileCopyrightText: 2019 Jiří Zárevúcky
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
-
-/* Modified for HelenOS use by Jiří Zárevúcky. */
 
 #include <stdbool.h>
Index: uspace/lib/compress/inflate.c
===================================================================
--- uspace/lib/compress/inflate.c	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ uspace/lib/compress/inflate.c	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,7 +1,7 @@
 /*
- * SPDX-FileCopyrightText: 2010 Mark Adler
+ * SPDX-FileCopyrightText: 2002-2010 Mark Adler
  * SPDX-FileCopyrightText: 2010 Martin Decky
  *
- * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause AND LicenseRef-InflateLicense
  */
 
@@ -15,29 +15,4 @@
  * All dynamically allocated memory memory is taken from the stack. The
  * stack usage should be typically bounded by 2 KB.
- *
- * Original copyright notice:
- *
- *  Copyright (C) 2002-2010 Mark Adler, all rights reserved
- *  version 2.1, 4 Apr 2010
- *
- *  This software is provided 'as-is', without any express or implied
- *  warranty. In no event will the author be held liable for any damages
- *  arising from the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1. The origin of this software must not be misrepresented; you must not
- *     claim that you wrote the original software. If you use this software
- *     in a product, an acknowledgment in the product documentation would be
- *     appreciated but is not required.
- *  2. Altered source versions must be plainly marked as such, and must not
- *     be misrepresented as being the original software.
- *  3. This notice may not be removed or altered from any source
- *     distribution.
- *
- *   Mark Adler <madler@alumni.caltech.edu>
- *
  */
 
Index: uspace/srv/fs/udf/udf_osta.c
===================================================================
--- uspace/srv/fs/udf/udf_osta.c	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ uspace/srv/fs/udf/udf_osta.c	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,5 +1,5 @@
 /*
+ * SPDX-FileCopyrightText: 1995 Micro Design International, Inc.
  * SPDX-FileCopyrightText: 2012 Julia Medvedeva
- * Copyright 1995 Micro Design International, Inc.
  *
  * SPDX-License-Identifier: BSD-3-Clause
Index: uspace/srv/fs/udf/udf_osta.h
===================================================================
--- uspace/srv/fs/udf/udf_osta.h	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ uspace/srv/fs/udf/udf_osta.h	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,5 +1,5 @@
 /*
+ * SPDX-FileCopyrightText: 1995 Micro Design International, Inc.
  * SPDX-FileCopyrightText: 2012 Julia Medvedeva
- * Copyright 1995 Micro Design International, Inc.
  *
  * SPDX-License-Identifier: BSD-3-Clause
Index: uspace/srv/loader/elf64_ia64_loader.x
===================================================================
--- uspace/srv/loader/elf64_ia64_loader.x	(revision 39916d6a2b44e033c4781b6a0c2da44c7e2ea57d)
+++ uspace/srv/loader/elf64_ia64_loader.x	(revision 34b2f54d3be2d93aaff4459146b01c439d421ef6)
@@ -1,7 +1,8 @@
 /* Default linker script, for normal executables */
-/* Copyright (C) 2014-2018 Free Software Foundation, Inc.
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
+/*
+ * SPDX-FileCopyrightText: 2014-2018 Free Software Foundation, Inc.
+ * SPDX-License-Identifier: FSFAP
+ */
+
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little",
 	      "elf64-ia64-little")