diff --git a/debian/copyright b/debian/copyright
index 2991c85..e763039 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,11 +11,6 @@
            2010      Nico Golde <nico@ngolde.de>
 License: GPL-2+
 
-Files: src/talloc.c include/osmocom/core/talloc.h
-Copyright: 2004 Andrew Tridgell
-           2006 Stefan Metzmacher
-License: LGPL-3+
-
 Files: include/osmocom/core/loggingrb.h
        include/osmocom/core/strrb.h
        src/strrb.c
@@ -30,8 +25,9 @@
 License: GPL-2+
 
 Files: include/osmocom/core/crc16.h
+       src/crc16.c
 Copyright: 2005 Ben Gardner <bgardner@wabtec.com>
-License: GPL-2+
+License: GPL-2
 
 Files: src/utils.c
 Copyright: 2011 Harald Welte <laforge@gnumonks.org>
@@ -110,7 +106,7 @@
        tests/stats/stats_test.c
 Copyright: 2009-2010 by Harald Welte <laforge@gnumonks.org>
            2009-2014 by Holger Hans Peter Freyther
-           2015 Sysmocom s.f.m.c. GmbH
+           2015 sysmocom - s.f.m.c. GmbH
 License: GPL-2+
 
 Files: tests/gb/gprs_ns_test.c
@@ -177,25 +173,6 @@
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-
-License: LGPL-3+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
-
-
 License: AGPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as published by
diff --git a/include/osmocom/core/bitcomp.h b/include/osmocom/core/bitcomp.h
index dc356bd..5faa5ea 100644
--- a/include/osmocom/core/bitcomp.h
+++ b/include/osmocom/core/bitcomp.h
@@ -1,10 +1,12 @@
 /*! \file bitcomp.h
  *  Osmocom bit compression routines. */
 /*
- * (C) 2016 sysmocom s.f.m.c. GmbH by Max Suraev <msuraev@sysmocom.de>
- *
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Max Suraev <msuraev@sysmocom.de>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h
index 19466ab..c9bab39 100644
--- a/include/osmocom/core/bitvec.h
+++ b/include/osmocom/core/bitvec.h
@@ -1,6 +1,6 @@
 /* (C) 2009 by Harald Welte <laforge@gnumonks.org>
  * (C) 2012 Ivan Klyuchnikov
- * (C) 2015 Sysmocom s.f.m.c. GmbH
+ * (C) 2015 sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h
index f50796c..e4d46ba 100644
--- a/include/osmocom/core/stats.h
+++ b/include/osmocom/core/stats.h
@@ -1,5 +1,5 @@
 /*
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h
index db15666..7432164 100644
--- a/include/osmocom/gsm/gsm0808_utils.h
+++ b/include/osmocom/gsm/gsm0808_utils.h
@@ -2,22 +2,22 @@
  *  @{
  *  \file gsm0808_utils.h */
 /*
- * (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH, Author: Philipp Maier
  * All Rights Reserved
  *
- * Author: Philipp Maier
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 8daf460..5cfe1ec 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -16,10 +16,12 @@
  *  \file gsup.h
  *  Osmocom Generic Subscriber Update Protocol message encoder/decoder. */
 /*
- * (C) 2014 by sysmocom s.f.m.c. GmbH, Author: Jacob Erlbeck
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH, Author: Jacob Erlbeck
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/include/osmocom/gsm/oap.h b/include/osmocom/gsm/oap.h
index ce1e151..f33cb50 100644
--- a/include/osmocom/gsm/oap.h
+++ b/include/osmocom/gsm/oap.h
@@ -8,10 +8,11 @@
  *
  *  \file oap.h */
 /*
- * (C) 2015-2016 by sysmocom s.f.m.c. GmbH
+ * (C) 2015-2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Neels Hofmeyr
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/src/application.c b/src/application.c
index 538ac45..2d237e2 100644
--- a/src/application.c
+++ b/src/application.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/backtrace.c b/src/backtrace.c
index 5ce7482..a18bde0 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/bitcomp.c b/src/bitcomp.c
index 94f60eb..d5a9310 100644
--- a/src/bitcomp.c
+++ b/src/bitcomp.c
@@ -1,10 +1,13 @@
 /*! \file bitcomp.c
  * Osmocom bit compression routines */
 /*
- * (C) 2016 sysmocom s.f.m.c. GmbH by Max Suraev <msuraev@sysmocom.de>
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Max Suraev <msuraev@sysmocom.de>
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/bits.c b/src/bits.c
index fa917b0..8837c1f 100644
--- a/src/bits.c
+++ b/src/bits.c
@@ -4,6 +4,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/bitvec.c b/src/bitvec.c
index e86315c..884eb02 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -1,9 +1,11 @@
 /* (C) 2009 by Harald Welte <laforge@gnumonks.org>
  * (C) 2012 Ivan Klyuchnikov
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/codec/gsm610.c b/src/codec/gsm610.c
index d5a2110..a05eaba 100644
--- a/src/codec/gsm610.c
+++ b/src/codec/gsm610.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c
index b1a0b31..282781f 100644
--- a/src/codec/gsm620.c
+++ b/src/codec/gsm620.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/codec/gsm660.c b/src/codec/gsm660.c
index 2f5c6a2..4f7bb09 100644
--- a/src/codec/gsm660.c
+++ b/src/codec/gsm660.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/codec/gsm690.c b/src/codec/gsm690.c
index 1ee74d0..1955716 100644
--- a/src/codec/gsm690.c
+++ b/src/codec/gsm690.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c
index 639d2df..cacc612 100644
--- a/src/coding/gsm0503_coding.c
+++ b/src/coding/gsm0503_coding.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/coding/gsm0503_interleaving.c b/src/coding/gsm0503_interleaving.c
index b42f242..d5008d0 100644
--- a/src/coding/gsm0503_interleaving.c
+++ b/src/coding/gsm0503_interleaving.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/coding/gsm0503_mapping.c b/src/coding/gsm0503_mapping.c
index d414769..1e37fce 100644
--- a/src/coding/gsm0503_mapping.c
+++ b/src/coding/gsm0503_mapping.c
@@ -4,6 +4,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/coding/gsm0503_parity.c b/src/coding/gsm0503_parity.c
index b57caa3..874114f 100644
--- a/src/coding/gsm0503_parity.c
+++ b/src/coding/gsm0503_parity.c
@@ -4,6 +4,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/coding/gsm0503_tables.c b/src/coding/gsm0503_tables.c
index dda8cad..5fe634b 100644
--- a/src/coding/gsm0503_tables.c
+++ b/src/coding/gsm0503_tables.c
@@ -4,6 +4,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv.c b/src/conv.c
index 420acca..a2c13de 100644
--- a/src/conv.c
+++ b/src/conv.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv_acc.c b/src/conv_acc.c
index 048bbb1..33fe264 100644
--- a/src/conv_acc.c
+++ b/src/conv_acc.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv_acc_generic.c b/src/conv_acc_generic.c
index 228f3e2..2887673 100644
--- a/src/conv_acc_generic.c
+++ b/src/conv_acc_generic.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv_acc_sse.c b/src/conv_acc_sse.c
index e9bbde1..a9679ef 100644
--- a/src/conv_acc_sse.c
+++ b/src/conv_acc_sse.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv_acc_sse_avx.c b/src/conv_acc_sse_avx.c
index c399719..5b6e704 100644
--- a/src/conv_acc_sse_avx.c
+++ b/src/conv_acc_sse_avx.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/conv_acc_sse_impl.h b/src/conv_acc_sse_impl.h
index 560af62..9ebbfe9 100644
--- a/src/conv_acc_sse_impl.h
+++ b/src/conv_acc_sse_impl.h
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/counter.c b/src/counter.c
index 2963777..0fa84c8 100644
--- a/src/counter.c
+++ b/src/counter.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/crc16.c b/src/crc16.c
index c03c008..29dace2 100644
--- a/src/crc16.c
+++ b/src/crc16.c
@@ -8,6 +8,8 @@
  *
  * This source code is licensed under the GNU General Public License,
  * Version 2. See the file COPYING for more details.
+ *
+ * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <osmocom/core/crc16.h>
diff --git a/src/crcXXgen.c.tpl b/src/crcXXgen.c.tpl
index befba4d..74e6d52 100644
--- a/src/crcXXgen.c.tpl
+++ b/src/crcXXgen.c.tpl
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c
index 24b388b..f616479 100644
--- a/src/ctrl/control_cmd.c
+++ b/src/ctrl/control_cmd.c
@@ -3,9 +3,13 @@
 /*
  * (C) 2010-2011 by Daniel Willmann <daniel@totalueberwachung.de>
  * (C) 2010-2011 by On-Waves
+ * (C) 2014 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2017 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
index 9b8a194..07b17c9 100644
--- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -3,9 +3,13 @@
 /*
  * (C) 2010-2011 by Daniel Willmann <daniel@totalueberwachung.de>
  * (C) 2010-2011 by On-Waves
+ * (C) 2014 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/ctrl/control_vty.c b/src/ctrl/control_vty.c
index a968bc0..ef98889 100644
--- a/src/ctrl/control_vty.c
+++ b/src/ctrl/control_vty.c
@@ -1,10 +1,12 @@
 /*! \file control_vty.c
  * VTY configuration for Control interface. */
 /*
- * (C) 2016 by sysmocom s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/ctrl/fsm_ctrl_commands.c b/src/ctrl/fsm_ctrl_commands.c
index 38fbd1e..3c7e1bd 100644
--- a/src/ctrl/fsm_ctrl_commands.c
+++ b/src/ctrl/fsm_ctrl_commands.c
@@ -1,5 +1,11 @@
 /*! \file fsm_ctrl_commands.c */
 
+/* (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
 #include <string.h>
 #include <errno.h>
 
diff --git a/src/fsm.c b/src/fsm.c
index 3f8de9c..827e8b3 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -3,6 +3,8 @@
 /*
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  *  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 2 of the License, or
diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c
index 16f3bbd..a47294b 100644
--- a/src/gb/common_vty.c
+++ b/src/gb/common_vty.c
@@ -5,6 +5,8 @@
  * (C) 2009-2010 by Holger Hans Peter Freyther
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c
index b906643..520868e 100644
--- a/src/gb/gprs_bssgp.c
+++ b/src/gb/gprs_bssgp.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c
index d9f04c5..3939e25 100644
--- a/src/gb/gprs_bssgp_bss.c
+++ b/src/gb/gprs_bssgp_bss.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c
index 4553da8..669dfb8 100644
--- a/src/gb/gprs_bssgp_util.c
+++ b/src/gb/gprs_bssgp_util.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c
index f787846..6131e6b 100644
--- a/src/gb/gprs_bssgp_vty.c
+++ b/src/gb/gprs_bssgp_vty.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index a00c8e5..47d170d 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -2,10 +2,13 @@
  * GPRS Networks Service (NS) messages on the Gb interface.
  * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05). */
 /*
- * (C) 2009-2012 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2009-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2016-2017 sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_ns_frgre.c b/src/gb/gprs_ns_frgre.c
index 52145ff..483fdb6 100644
--- a/src/gb/gprs_ns_frgre.c
+++ b/src/gb/gprs_ns_frgre.c
@@ -3,10 +3,12 @@
  * GPRS Networks Service (NS) messages on the Gb interface,
  * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05). */
 /*
- * (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2009-2010,2014,2017 by Harald Welte <laforge@gnumonks.org>
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c
index e8ef2a2..667db7d 100644
--- a/src/gb/gprs_ns_vty.c
+++ b/src/gb/gprs_ns_vty.c
@@ -1,10 +1,13 @@
 /*! \file gprs_ns_vty.c
  * VTY interface for our GPRS Networks Service (NS) implementation. */
 /*
- * (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2009-2014 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/a5.c b/src/gsm/a5.c
index ea09e17..223d3ad 100644
--- a/src/gsm/a5.c
+++ b/src/gsm/a5.c
@@ -3,6 +3,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index 7207fb9..8a3886d 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -1,8 +1,10 @@
 /*
- * (C) 2008-2011 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2008-2014,2017 by Harald Welte <laforge@gnumonks.org>
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/apn.c b/src/gsm/apn.c
index f8303db..e6632dd 100644
--- a/src/gsm/apn.c
+++ b/src/gsm/apn.c
@@ -1,4 +1,24 @@
-/*! \file apn.c */
+/*! \file apn.c 
+ *
+ * (C) 2014 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2015,2017 by sysmocom - s.f.m.c. GmbH
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * 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 2 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/>.
+ */
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/gsm/auth_comp128v1.c b/src/gsm/auth_comp128v1.c
index 1dddef3..493ebfd 100644
--- a/src/gsm/auth_comp128v1.c
+++ b/src/gsm/auth_comp128v1.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/auth_comp128v23.c b/src/gsm/auth_comp128v23.c
index 4d23769..279d2b7 100644
--- a/src/gsm/auth_comp128v23.c
+++ b/src/gsm/auth_comp128v23.c
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c
index 738e860..9e3b2c0 100644
--- a/src/gsm/auth_core.c
+++ b/src/gsm/auth_core.c
@@ -2,6 +2,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/auth_milenage.c b/src/gsm/auth_milenage.c
index 2ddf712..9589100 100644
--- a/src/gsm/auth_milenage.c
+++ b/src/gsm/auth_milenage.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/comp128.c b/src/gsm/comp128.c
index 0fcc67d..b28a843 100644
--- a/src/gsm/comp128.c
+++ b/src/gsm/comp128.c
@@ -46,6 +46,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/comp128v23.c b/src/gsm/comp128v23.c
index 12f8a4c..68f4b2a 100644
--- a/src/gsm/comp128v23.c
+++ b/src/gsm/comp128v23.c
@@ -9,6 +9,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gan.c b/src/gsm/gan.c
index fae93f1..8cd4f78 100644
--- a/src/gsm/gan.c
+++ b/src/gsm/gan.c
@@ -4,6 +4,8 @@
  * (C) 2012 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gea.c b/src/gsm/gea.c
index 70f08ad..5756bb0 100644
--- a/src/gsm/gea.c
+++ b/src/gsm/gea.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * Copyright (C) 2016 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
  * 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
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index fc68c40..6fa25d6 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gprs_gea.c b/src/gsm/gprs_gea.c
index db3f2cc..7314788 100644
--- a/src/gsm/gprs_gea.c
+++ b/src/gsm/gprs_gea.c
@@ -1,13 +1,15 @@
 /*! \file gprs_gea.c
  * GEA 3 & 4 plugin */
 /*
- * Copyright (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * Copyright (C) 2016 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/src/gsm/gprs_rlc.c b/src/gsm/gprs_rlc.c
index d2c05b7..bdfc8ea 100644
--- a/src/gsm/gprs_rlc.c
+++ b/src/gsm/gprs_rlc.c
@@ -1,5 +1,12 @@
 /*! \file gsm/gprs_rlc.c
  *  helper functions for (E)GPRS RLC according to 3GPP TS 44.060.
+ *
+ *  (C) 2016 by Thomas Thou
+ *  (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
+ *  (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ *  All Rights Reserved.
+ *
+ *  SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <errno.h>
diff --git a/src/gsm/gsm0341.c b/src/gsm/gsm0341.c
index 485023f..89f5de3 100644
--- a/src/gsm/gsm0341.c
+++ b/src/gsm/gsm0341.c
@@ -2,6 +2,8 @@
  * (C) 2014 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0411_smc.c b/src/gsm/gsm0411_smc.c
index f7c536b..28287e4 100644
--- a/src/gsm/gsm0411_smc.c
+++ b/src/gsm/gsm0411_smc.c
@@ -10,6 +10,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0411_smr.c b/src/gsm/gsm0411_smr.c
index 0a25c7c..892b7f0 100644
--- a/src/gsm/gsm0411_smr.c
+++ b/src/gsm/gsm0411_smr.c
@@ -10,6 +10,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c
index acf7e23..53d37a4 100644
--- a/src/gsm/gsm0411_utils.c
+++ b/src/gsm/gsm0411_utils.c
@@ -10,6 +10,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index 557aa14..71470e5 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0502.c b/src/gsm/gsm0502.c
index 6b69893..53259a4 100644
--- a/src/gsm/gsm0502.c
+++ b/src/gsm/gsm0502.c
@@ -4,6 +4,8 @@
  * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index ee5eda4..2396a10 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -3,6 +3,8 @@
  * (C) 2009,2010 by On-Waves
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c
index 798a122..93e6074 100644
--- a/src/gsm/gsm0808_utils.c
+++ b/src/gsm/gsm0808_utils.c
@@ -1,20 +1,20 @@
 /*
- * (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH, Author: Philipp Maier
  * All Rights Reserved
  *
- * Author: Philipp Maier
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c
index 3c09aca..95ac9f8 100644
--- a/src/gsm/gsm23003.c
+++ b/src/gsm/gsm23003.c
@@ -1,10 +1,11 @@
 /*! \file gsm23003.c
  * Utility function implementations related to 3GPP TS 23.003 */
 /*
- * (C) 2017 sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * (C) 2017 sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index 10e2b80..a7daea4 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 105acba..1baf287 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm_04_08_gprs.c b/src/gsm/gsm_04_08_gprs.c
index 43da27e..608fa8c 100644
--- a/src/gsm/gsm_04_08_gprs.c
+++ b/src/gsm/gsm_04_08_gprs.c
@@ -2,10 +2,12 @@
 /*
  * (C) 2009-2016 by Harald Welte <laforge@gnumonks.org>
  * (C) 2010      by On-Waves
- * (C) 2014-2015 by Sysmocom s.f.m.c. GmbH
+ * (C) 2014-2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 134b475..8464090 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c
index e5b0a66..eb829f7 100644
--- a/src/gsm/gsup.c
+++ b/src/gsm/gsup.c
@@ -1,10 +1,11 @@
 /*
- * (C) 2014 by sysmocom s.f.m.c. GmbH
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH
+ * Author: Jacob Erlbeck
  * (C) 2015 by Holger Hans Peter Freyther
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
- * Author: Jacob Erlbeck
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c
index fef73c3..e00e2d0 100644
--- a/src/gsm/ipa.c
+++ b/src/gsm/ipa.c
@@ -7,6 +7,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/kasumi.c b/src/gsm/kasumi.c
index c3a028b..7de5cd0 100644
--- a/src/gsm/kasumi.c
+++ b/src/gsm/kasumi.c
@@ -2,9 +2,10 @@
  * Kasumi cipher and KGcore functions. */
 /*
  * (C) 2013 by Max <Max.Suraev@fairwaves.ru>
- *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c
index 6b58006..d14063e 100644
--- a/src/gsm/lapd_core.c
+++ b/src/gsm/lapd_core.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index db950a6..5efe755 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -1,11 +1,14 @@
 /*! \file lapdm.c
  * GSM LAPDm (TS 04.06) implementation. */
 /*
- * (C) 2010-2011 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2010-2017 by Harald Welte <laforge@gnumonks.org>
  * (C) 2010-2011 by Andreas Eversberg <jolly@eversberg.eu>
+ * (C) 2014-2016 by sysmocom - s.f.m.c GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/milenage/aes-encblock.c b/src/gsm/milenage/aes-encblock.c
index c4aa260..9fd73f6 100644
--- a/src/gsm/milenage/aes-encblock.c
+++ b/src/gsm/milenage/aes-encblock.c
@@ -10,6 +10,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/aes-internal-enc.c b/src/gsm/milenage/aes-internal-enc.c
index 4c00f96..6de9992 100644
--- a/src/gsm/milenage/aes-internal-enc.c
+++ b/src/gsm/milenage/aes-internal-enc.c
@@ -19,6 +19,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/aes-internal.c b/src/gsm/milenage/aes-internal.c
index 60c520c..c46654a 100644
--- a/src/gsm/milenage/aes-internal.c
+++ b/src/gsm/milenage/aes-internal.c
@@ -19,6 +19,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/aes.h b/src/gsm/milenage/aes.h
index ce42b20..5410c36 100644
--- a/src/gsm/milenage/aes.h
+++ b/src/gsm/milenage/aes.h
@@ -10,6 +10,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/aes_i.h b/src/gsm/milenage/aes_i.h
index 6df019a..3e0fd21 100644
--- a/src/gsm/milenage/aes_i.h
+++ b/src/gsm/milenage/aes_i.h
@@ -10,6 +10,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/aes_wrap.h b/src/gsm/milenage/aes_wrap.h
index 7d4d5d9..b644d4c 100644
--- a/src/gsm/milenage/aes_wrap.h
+++ b/src/gsm/milenage/aes_wrap.h
@@ -17,6 +17,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/milenage/milenage.c b/src/gsm/milenage/milenage.c
index 012b399..7cf3312 100644
--- a/src/gsm/milenage/milenage.c
+++ b/src/gsm/milenage/milenage.c
@@ -12,6 +12,8 @@
  *
  * See README and COPYING for more details.
  *
+ * SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+ *
  * This file implements an example authentication algorithm defined for 3GPP
  * AKA. This can be used to implement a simple HLR/AuC into hlr_auc_gw to allow
  * EAP-AKA to be tested properly with real USIM cards.
diff --git a/src/gsm/milenage/milenage.h b/src/gsm/milenage/milenage.h
index 1a4364d..ea93fda 100644
--- a/src/gsm/milenage/milenage.h
+++ b/src/gsm/milenage/milenage.h
@@ -11,6 +11,8 @@
  * Alternatively, this software may be distributed under the terms of BSD
  * license.
  *
+ * SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause
+ *
  * See README and COPYING for more details.
  */
 
diff --git a/src/gsm/oap.c b/src/gsm/oap.c
index aab5cac..a133889 100644
--- a/src/gsm/oap.c
+++ b/src/gsm/oap.c
@@ -1,8 +1,9 @@
 /*
- * (C) 2015-2016 by sysmocom s.f.m.c. GmbH
+ * (C) 2015-2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Neels Hofmeyr
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 2a2af1f..abda932 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -1,8 +1,12 @@
 /*
- * (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2008-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2013 by Holger Freyther <holger@freyther.de>
+ * (C) 2014-2016 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c
index 2ff0ac8..9c650cc 100644
--- a/src/gsm/rxlev_stat.c
+++ b/src/gsm/rxlev_stat.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/sysinfo.c b/src/gsm/sysinfo.c
index b73bb0c..b615871 100644
--- a/src/gsm/sysinfo.c
+++ b/src/gsm/sysinfo.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index b1b1034..ead856c 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,7 +1,10 @@
-/* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
+/* (C) 2008-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
index 28149c0..8f9496a 100644
--- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/logging.c b/src/logging.c
index fa733cd..20ec443 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -5,6 +5,8 @@
  * (C) 2008 by Holger Hans Peter Freyther <zecke@selfish.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c
index d0aa47b..ec6757c 100644
--- a/src/logging_gsmtap.c
+++ b/src/logging_gsmtap.c
@@ -9,6 +9,8 @@
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/logging_syslog.c b/src/logging_syslog.c
index d0d6a96..f980689 100644
--- a/src/logging_syslog.c
+++ b/src/logging_syslog.c
@@ -4,6 +4,8 @@
  * (C) 2011 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/loggingrb.c b/src/loggingrb.c
index d3dd254..4a80cc8 100644
--- a/src/loggingrb.c
+++ b/src/loggingrb.c
@@ -4,6 +4,8 @@
  * (C) 2012-2013 by Katerina Barone-Adesi
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/macaddr.c b/src/macaddr.c
index 5c68d05..afa7c93 100644
--- a/src/macaddr.c
+++ b/src/macaddr.c
@@ -6,6 +6,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/msgb.c b/src/msgb.c
index 6fcbe53..faef09e 100644
--- a/src/msgb.c
+++ b/src/msgb.c
@@ -2,6 +2,8 @@
  * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/msgfile.c b/src/msgfile.c
index 8517099..278b9a7 100644
--- a/src/msgfile.c
+++ b/src/msgfile.c
@@ -5,6 +5,8 @@
  * (C) 2010 by On-Waves
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/panic.c b/src/panic.c
index 2a8b1ae..a08f89f 100644
--- a/src/panic.c
+++ b/src/panic.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/plugin.c b/src/plugin.c
index 264171c..40de4f8 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/prbs.c b/src/prbs.c
index be52fd4..8fa04bb 100644
--- a/src/prbs.c
+++ b/src/prbs.c
@@ -1,5 +1,9 @@
 /* Osmocom implementation of pseudo-random bit sequence generation */
-/* (C) 2017 by Harald Welte <laforge@gnumonks.org> */
+/* (C) 2017 by Harald Welte <laforge@gnumonks.org> 
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ * */
 
 #include <stdint.h>
 #include <string.h>
diff --git a/src/prim.c b/src/prim.c
index d18dbd7..3c8a7f1 100644
--- a/src/prim.c
+++ b/src/prim.c
@@ -1,4 +1,10 @@
-/*! \addtogroup prim
+/*! 
+ * (C) 2015-2017 by Harald Welte <laforge@gnumonks.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * \addtogroup prim
  *  @{
  *  \file prim.c */
 
diff --git a/src/pseudotalloc/pseudotalloc.c b/src/pseudotalloc/pseudotalloc.c
index b77ffe9..2a99066 100644
--- a/src/pseudotalloc/pseudotalloc.c
+++ b/src/pseudotalloc/pseudotalloc.c
@@ -1,7 +1,26 @@
 /*! \file pseudotalloc.c
  * overly simplistic talloc replacement for deeply embedded
  * microcontrollers.  Obviously this has none of the properties of real
- * talloc, it is particualrly not hierarchical at all. */
+ * talloc, it is particualrly not hierarchical at all.
+ *
+ * (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * 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 2 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/>.
+ */
 
 #include "talloc.h"
 #include <string.h>
diff --git a/src/pseudotalloc/talloc.h b/src/pseudotalloc/talloc.h
index 3ce9f37..ae2e1fc 100644
--- a/src/pseudotalloc/talloc.h
+++ b/src/pseudotalloc/talloc.h
@@ -1,7 +1,25 @@
 /*! \file talloc.h
  * overly simplistic talloc replacement for deeply embedded
  * microcontrollers.  Obviously this has none of the properties of real
- * talloc, it is particualrly not hierarchical at all. */
+ * talloc, it is particualrly not hierarchical at all.
+ *
+ * (C) 2017 by Harald Welte <laforge@gnumonks.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * 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 2 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/>.
+ */
 
 #pragma once
 
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 296cc16..5464490 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -2,6 +2,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/rbtree.c b/src/rbtree.c
index f0ebb8c..211978f 100644
--- a/src/rbtree.c
+++ b/src/rbtree.c
@@ -2,7 +2,9 @@
   Red Black Trees
   (C) 1999  Andrea Arcangeli <andrea@suse.de>
   (C) 2002  David Woodhouse <dwmw2@infradead.org>
-  
+
+  SPDX-License-Identifier: GPL-2.0+
+
   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 2 of the License, or
diff --git a/src/select.c b/src/select.c
index 4b98b62..1c62e01 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5,6 +5,9 @@
  * of the linux 2.4 netfilter subsystem. */
 /*
  * (C) 2000-2009 by Harald Welte <laforge@gnumonks.org>
+ * All Rights Reserverd.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  *
  *  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
diff --git a/src/sercomm.c b/src/sercomm.c
index 07b1aa0..2639bf8 100644
--- a/src/sercomm.c
+++ b/src/sercomm.c
@@ -2,6 +2,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/serial.c b/src/serial.c
index 8ddd38e..1b5a4cf 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/signal.c b/src/signal.c
index 0c56465..745d7c3 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -4,6 +4,8 @@
  * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/card_fs_isim.c b/src/sim/card_fs_isim.c
index 1073429..e6ba0d0 100644
--- a/src/sim/card_fs_isim.c
+++ b/src/sim/card_fs_isim.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/card_fs_sim.c b/src/sim/card_fs_sim.c
index 1411129..f66e391 100644
--- a/src/sim/card_fs_sim.c
+++ b/src/sim/card_fs_sim.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/card_fs_tetra.c b/src/sim/card_fs_tetra.c
index 80f3284..7bf0279 100644
--- a/src/sim/card_fs_tetra.c
+++ b/src/sim/card_fs_tetra.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/card_fs_uicc.c b/src/sim/card_fs_uicc.c
index 8ff8936..af6061c 100644
--- a/src/sim/card_fs_uicc.c
+++ b/src/sim/card_fs_uicc.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index fcf67f0..593b2e8 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -3,6 +3,8 @@
 /*
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2, or
  *  any later version as published by the Free Software Foundation.
diff --git a/src/sim/core.c b/src/sim/core.c
index 8da839c..a78cecc 100644
--- a/src/sim/core.c
+++ b/src/sim/core.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/reader.c b/src/sim/reader.c
index f39829b..d1a9ae6 100644
--- a/src/sim/reader.c
+++ b/src/sim/reader.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/sim/reader_pcsc.c b/src/sim/reader_pcsc.c
index 5b29638..f22103f 100644
--- a/src/sim/reader_pcsc.c
+++ b/src/sim/reader_pcsc.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/socket.c b/src/socket.c
index b516abf..82ccfed 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -3,6 +3,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/stat_item.c b/src/stat_item.c
index cbcdebc..cb9b90f 100644
--- a/src/stat_item.c
+++ b/src/stat_item.c
@@ -1,11 +1,13 @@
 /*! \file stat_item.c
  * utility routines for keeping statistical values */
 /*
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
  * (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/stats.c b/src/stats.c
index ff31ff6..b5adbf2 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,11 +1,11 @@
 /*! \file stats.c */
 /*
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
- *
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
- *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/stats_statsd.c b/src/stats_statsd.c
index 5145bf7..c11c013 100644
--- a/src/stats_statsd.c
+++ b/src/stats_statsd.c
@@ -1,10 +1,10 @@
 /*
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
- *
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
- *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/strrb.c b/src/strrb.c
index 6bfb179..461fdec 100644
--- a/src/strrb.c
+++ b/src/strrb.c
@@ -19,6 +19,8 @@
  * (C) 2012-2013, Katerina Barone-Adesi <kat.obsc@gmail.com>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/timer.c b/src/timer.c
index bf46c24..9ec7a00 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -7,6 +7,8 @@
  *	    Harald Welte <laforge@gnumonks.org>
  *	    Pablo Neira Ayuso <pablo@gnumonks.org>
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/timer_gettimeofday.c b/src/timer_gettimeofday.c
index 4298805..15b5e31 100644
--- a/src/timer_gettimeofday.c
+++ b/src/timer_gettimeofday.c
@@ -1,8 +1,9 @@
 /*
- * (C) 2016 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Authors: Neels Hofmeyr <nhofmeyr@sysmocom.de>
  * All Rights Reserved
  *
- * Authors: Neels Hofmeyr <nhofmeyr@sysmocom.de>
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/src/utils.c b/src/utils.c
index a62f5e9..f63ff89 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/buffer.c b/src/vty/buffer.c
index 1935aa1..e68e3a2 100644
--- a/src/vty/buffer.c
+++ b/src/vty/buffer.c
@@ -3,6 +3,8 @@
 /*
  * Copyright (C) 1998 Kunihiro Ishiguro
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This file is part of GNU Zebra.
  *
  * GNU Zebra is free software; you can redistribute it and/or modify
diff --git a/src/vty/command.c b/src/vty/command.c
index 98d86d2..5f7a42c 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -3,6 +3,12 @@
 
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
+   Copyright (C) 2010-2011 Holger Hans Peter Freyther <zecke@selfish.org>
+   Copyright (C) 2012 Sylvain Munaut <tnt@246tNt.com>
+   Copyright (C) 2013,2015 Harald Welte <laforge@gnumonks.org>
+   Copyright (C) 2013,2017 sysmocom - s.f.m.c. GmbH
+
+   SPDX-License-Identifier: GPL-2.0+
 
 This file is part of GNU Zebra.
 
diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c
index 50c7fd5..8abb9c9 100644
--- a/src/vty/fsm_vty.c
+++ b/src/vty/fsm_vty.c
@@ -2,6 +2,8 @@
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 9b7d10a..215394f 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -3,6 +3,8 @@
  * (C) 2009-2014 by Holger Hans Peter Freyther
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c
index 2ccbf66..6c09c38 100644
--- a/src/vty/stats_vty.c
+++ b/src/vty/stats_vty.c
@@ -1,9 +1,11 @@
 /*
  * (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
  * (C) 2009-2014 by Holger Hans Peter Freyther
- * (C) 2015      by Sysmocom s.f.m.c. GmbH
+ * (C) 2015      by sysmocom - s.f.m.c. GmbH
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/talloc_ctx_vty.c b/src/vty/talloc_ctx_vty.c
index 136a1b4..601b696 100644
--- a/src/vty/talloc_ctx_vty.c
+++ b/src/vty/talloc_ctx_vty.c
@@ -5,6 +5,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c
index 40154fe..0ccf8dc 100644
--- a/src/vty/telnet_interface.c
+++ b/src/vty/telnet_interface.c
@@ -1,6 +1,9 @@
-/* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
+/* (C) 2009-2010 by Holger Hans Peter Freyther <zecke@selfish.org>
+ * (C) 2010 by Sylvain Munaut <tnt@246tNt.com>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/utils.c b/src/vty/utils.c
index e7aeb88..8cd0b35 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -2,9 +2,12 @@
  * Utility routines for printing common objects in the Osmocom world. */
 /*
  * (C) 2009-2010 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2013,2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/src/vty/vector.c b/src/vty/vector.c
index ee07cbd..f9e5ec3 100644
--- a/src/vty/vector.c
+++ b/src/vty/vector.c
@@ -3,6 +3,8 @@
 /*
  * Copyright (C) 1997 Kunihiro Ishiguro
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This file is part of GNU Zebra.
  *
  * GNU Zebra is free software; you can redistribute it and/or modify it
diff --git a/src/vty/vty.c b/src/vty/vty.c
index aef73b3..e741a66 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -22,7 +22,7 @@
  *
  * \section sec_copyright Copyright and License
  * Copyright © 1997-2007 - Kuninhiro Ishiguro\n
- * Copyright © 2008-2011 - Harald Welte, Holger Freyther and contributors\n
+ * Copyright © 2008-2012 - Harald Welte, Holger Freyther and contributors\n
  * All rights reserved. \n\n
  * The source code of libosmovty is licensed under the terms of the GNU
  * General Public License as published by the Free Software Foundation;
@@ -46,6 +46,7 @@
  * <http://sysmocom.de/>
  */
 
+/* SPDX-License-Identifier: GPL-2.0+ */
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/write_queue.c b/src/write_queue.c
index 203815b..fb6839a 100644
--- a/src/write_queue.c
+++ b/src/write_queue.c
@@ -4,6 +4,8 @@
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c
index cb88b01..a631712 100644
--- a/tests/abis/abis_test.c
+++ b/tests/abis/abis_test.c
@@ -1,6 +1,6 @@
 /*
  * (C) 2012 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2017 by sysmocom s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2017 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/tests/codec/codec_test.c b/tests/codec/codec_test.c
index b204d77..7a10fc5 100644
--- a/tests/codec/codec_test.c
+++ b/tests/codec/codec_test.c
@@ -1,10 +1,12 @@
 /*
- * (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -12,7 +14,7 @@
  * 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 Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c
index 3de05dd..1624a31 100644
--- a/tests/gb/gprs_bssgp_test.c
+++ b/tests/gb/gprs_bssgp_test.c
@@ -1,10 +1,12 @@
 /* Test routines for the BSSGP implementation in libosmogb
  *
- * (C) 2014 by sysmocom s.f.m.c. GmbH
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
  *
  * Skeleton based on bssgp_fc_test.c
  * (C) 2012 by Harald Welte <laforge@gnumonks.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #undef _GNU_SOURCE
diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index fac3c36..7e6b85c 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -1,6 +1,8 @@
 /* test routines for NS connection handling
- * (C) 2013 by sysmocom s.f.m.c. GmbH
+ * (C) 2013 by sysmocom - s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #undef _GNU_SOURCE
diff --git a/tests/gsm23003/gsm23003_test.c b/tests/gsm23003/gsm23003_test.c
index a408b73..64d756d 100644
--- a/tests/gsm23003/gsm23003_test.c
+++ b/tests/gsm23003/gsm23003_test.c
@@ -1,8 +1,9 @@
 /*
  * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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
diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c
index 0dccaa4..d6c0495 100644
--- a/tests/lapd/lapd_test.c
+++ b/tests/lapd/lapd_test.c
@@ -1,9 +1,11 @@
 /*
  * (C) 2011 by Holger Hans Peter Freyther
  * (C) 2011 by On-Waves
- * (C) 2014 by Daniel Willmann <dwillmann@sysmocom.de>
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH, Author: Daniel Willmann <dwillmann@sysmocom.de>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/tests/oap/oap_test.c b/tests/oap/oap_test.c
index 0c4c16e..dea5c11 100644
--- a/tests/oap/oap_test.c
+++ b/tests/oap/oap_test.c
@@ -1,9 +1,9 @@
 /* Test Osmocom Authentication Protocol */
 /*
- * (C) 2016 by sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Neels Hofmeyr
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr
  *
  * 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
diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c
index 59fc449..b302b37 100644
--- a/tests/stats/stats_test.c
+++ b/tests/stats/stats_test.c
@@ -1,9 +1,11 @@
 /* tests for statistics */
 /*
- * (C) 2015 Sysmocom s.m.f.c. GmbH
+ * (C) 2015 sysmocom - s.m.f.c. GmbH
  *
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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 2 of the License, or
diff --git a/tests/strrb/strrb_test.c b/tests/strrb/strrb_test.c
index 6140ac9..4282d1a 100644
--- a/tests/strrb/strrb_test.c
+++ b/tests/strrb/strrb_test.c
@@ -1,6 +1,8 @@
 /* (C) 2012-2013 by Katerina Barone-Adesi <kat.obsc@gmail.com>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-3.0+
+ *
  * This program is iree 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
diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c
index 2542baf..42646eb 100644
--- a/tests/vty/vty_test.c
+++ b/tests/vty/vty_test.c
@@ -1,9 +1,11 @@
-/* (C) 2013 by Jacob Erlbeck <jerlbeck@sysmocom.de>
+/* (C) 2013 by sysmocom - s.f.m.c. GmbH, Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
  * All Rights Reserved
  *
- * This program is iree software; you can redistribute it and/or modify
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,