diff --git a/ada/clock_gettime/hw-time-timer.adb b/ada/clock_gettime/hw-time-timer.adb
index 914b201..5f12db7 100644
--- a/ada/clock_gettime/hw-time-timer.adb
+++ b/ada/clock_gettime/hw-time-timer.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/ada/dynamic_mmio/hw-mmio_range.adb b/ada/dynamic_mmio/hw-mmio_range.adb
index 78cc048..6a1f1f9 100644
--- a/ada/dynamic_mmio/hw-mmio_range.adb
+++ b/ada/dynamic_mmio/hw-mmio_range.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/ada/static_mmio/hw-mmio_range.adb b/ada/static_mmio/hw-mmio_range.adb
index fb72152..7e111a7 100644
--- a/ada/static_mmio/hw-mmio_range.adb
+++ b/ada/static_mmio/hw-mmio_range.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-mmio_range.ads b/common/hw-mmio_range.ads
index 1b33630..8495f73 100644
--- a/common/hw-mmio_range.ads
+++ b/common/hw-mmio_range.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-mmio_regs.adb b/common/hw-mmio_regs.adb
index 5eea563..acd23ec 100644
--- a/common/hw-mmio_regs.adb
+++ b/common/hw-mmio_regs.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-mmio_regs.ads b/common/hw-mmio_regs.ads
index 9aafed9..774b2b8 100644
--- a/common/hw-mmio_regs.ads
+++ b/common/hw-mmio_regs.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-port_io.adb b/common/hw-port_io.adb
index e8adfc2..0ae03f1 100644
--- a/common/hw-port_io.adb
+++ b/common/hw-port_io.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-port_io.ads b/common/hw-port_io.ads
index a5d0e9e..94b5197 100644
--- a/common/hw-port_io.ads
+++ b/common/hw-port_io.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-sub_regs.ads b/common/hw-sub_regs.ads
index ca04c1d..5ddf3ba 100644
--- a/common/hw-sub_regs.ads
+++ b/common/hw-sub_regs.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-time-timer.ads b/common/hw-time-timer.ads
index 4676815..cfe2e0b 100644
--- a/common/hw-time-timer.ads
+++ b/common/hw-time-timer.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-time.adb b/common/hw-time.adb
index 3162de1..c1666a6 100644
--- a/common/hw-time.adb
+++ b/common/hw-time.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw-time.ads b/common/hw-time.ads
index 743279b..aeda5ec 100644
--- a/common/hw-time.ads
+++ b/common/hw-time.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/common/hw.ads b/common/hw.ads
index 6bfca91..9adb794 100644
--- a/common/hw.ads
+++ b/common/hw.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/debug/hw-debug.adb b/debug/hw-debug.adb
index 3ffa9b5..60968e1 100644
--- a/debug/hw-debug.adb
+++ b/debug/hw-debug.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/debug/hw-debug.ads b/debug/hw-debug.ads
index fd8ce9c..adf61fb 100644
--- a/debug/hw-debug.ads
+++ b/debug/hw-debug.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/debug/null/hw-debug_sink.ads b/debug/null/hw-debug_sink.ads
index dcd2dd1..065ce4b 100644
--- a/debug/null/hw-debug_sink.ads
+++ b/debug/null/hw-debug_sink.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/debug/text_io/hw-debug_sink.ads b/debug/text_io/hw-debug_sink.ads
index 2f0b2d2..fa02922 100644
--- a/debug/text_io/hw-debug_sink.ads
+++ b/debug/text_io/hw-debug_sink.ads
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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
diff --git a/proof/hw-mmio_range.adb b/proof/hw-mmio_range.adb
index d96fc4b..9c0da37 100644
--- a/proof/hw-mmio_range.adb
+++ b/proof/hw-mmio_range.adb
@@ -3,7 +3,8 @@
 --
 -- 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.
+-- 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