diff --git a/Documentation/mainboard_io_trap_handler_sample.c b/Documentation/mainboard_io_trap_handler_sample.c
index f440f8dd71..f785568bdb 100644
--- a/Documentation/mainboard_io_trap_handler_sample.c
+++ b/Documentation/mainboard_io_trap_handler_sample.c
@@ -1,18 +1,5 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008-2009 coresystems GmbH
- * Copyright 2013 Google Inc.
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
+/* This file is part of the coreboot project. */
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/io.h>
 #include <console/console.h>
diff --git a/Makefile.inc b/Makefile.inc
index e315732ec9..ef247da00f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,17 +1,5 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2011 secunet Security Networks AG
-##
-## 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; version 2 of the License.
-##
-## 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.
-##
+# This file is part of the coreboot project.
+# SPDX-License-Identifier: GPL-2.0-only
 
 ifneq ($(NOCOMPILE),1)
 GIT:=$(shell git -C "$(top)" rev-parse --git-dir 1>/dev/null 2>&1 \
diff --git a/gnat.adc b/gnat.adc
index 88cf438d77..c4a9f72c51 100644
--- a/gnat.adc
+++ b/gnat.adc
@@ -1,15 +1,5 @@
---
 -- This file is part of the coreboot project.
---
--- 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; version 2 of the License.
---
--- 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.
---
+-- SPDX-License-Identifier: GPL-2.0-only
 
 pragma Restrictions (No_Access_Subprograms);
 pragma Restrictions (No_Allocators);
diff --git a/toolchain.inc b/toolchain.inc
index 865227b3a7..2a4a91dafd 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -1,17 +1,5 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2014 Google Inc
-##
-## 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; version 2 of the License.
-##
-## 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.
-##
+# This file is part of the coreboot project.
+# SPDX-License-Identifier: GPL-2.0-only
 
 # ccache integration
 ifeq ($(CONFIG_CCACHE),y)