diff --git a/contrib/itmdump.c b/contrib/itmdump.c
index 88099040a..f31e1ff75 100644
--- a/contrib/itmdump.c
+++ b/contrib/itmdump.c
@@ -1,19 +1,6 @@
-/*
- * Copyright (C) 2010 by David Brownell
- *
- * 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 program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+
+/* Copyright (C) 2010 by David Brownell */
 
 /*
  * Simple utility to parse and dump ARM Cortex-M3 SWO trace output.  Once the
diff --git a/contrib/rpc_examples/ocd_rpc_example.py b/contrib/rpc_examples/ocd_rpc_example.py
index e6146f617..53e3e2afc 100755
--- a/contrib/rpc_examples/ocd_rpc_example.py
+++ b/contrib/rpc_examples/ocd_rpc_example.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 """
 OpenOCD RPC example, covered by GNU GPLv3 or later
 Copyright (C) 2014 Andreas Ortmann (ortmann@finf.uni-hannover.de)
diff --git a/contrib/rpc_examples/ocdrpc.hs b/contrib/rpc_examples/ocdrpc.hs
index 859864131..6a92366b7 100644
--- a/contrib/rpc_examples/ocdrpc.hs
+++ b/contrib/rpc_examples/ocdrpc.hs
@@ -1,4 +1,6 @@
--- OpenOCD RPC example, covered by GNU GPLv3 or later
+-- SPDX-License-Identifier: GPL-3.0-or-later
+
+-- OpenOCD RPC example
 -- Copyright (C) 2014 Paul Fertser
 --
 -- Example output: