diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki
index 556176b7..ff5d1352 100644
--- a/bip-0002.mediawiki
+++ b/bip-0002.mediawiki
@@ -5,7 +5,7 @@
   Status: Closed
   Type: Process
   Assigned: 2016-02-03
-  License: BSD-2-Clause OR OPL
+  License: BSD-2-Clause OR OPUBL-1.0
   Replaces: 1
   Proposed-Replacement: 3
 </pre>
diff --git a/bip-0052.mediawiki b/bip-0052.mediawiki
index e61f55a0..72b28233 100644
--- a/bip-0052.mediawiki
+++ b/bip-0052.mediawiki
@@ -7,7 +7,7 @@
   Status: Draft
   Type: Specification
   Assigned: 2021-05-13
-  License: BSD-2-Clause OR OPL
+  License: BSD-2-Clause OR OPUBL-1.0
 </pre>
 
 
diff --git a/bip-0085.mediawiki b/bip-0085.mediawiki
index 518b9ed0..23009da3 100644
--- a/bip-0085.mediawiki
+++ b/bip-0085.mediawiki
@@ -7,7 +7,7 @@
   Status: Deployed
   Type: Informational
   Assigned: 2020-03-20
-  License: BSD-2-Clause OR OPL
+  License: BSD-2-Clause OR OPUBL-1.0
 </pre>
 
 ==Abstract==
diff --git a/bip-0104.mediawiki b/bip-0104.mediawiki
index cd00a914..cf0d6a02 100644
--- a/bip-0104.mediawiki
+++ b/bip-0104.mediawiki
@@ -6,7 +6,7 @@
   Status: Closed
   Type: Specification
   Assigned: 2017-01-13
-  License: BSD-2-Clause OR GNU-All-Permissive
+  License: BSD-2-Clause OR FSFAP
 </pre>
 
 ==Abstract==
diff --git a/bip-0123.mediawiki b/bip-0123.mediawiki
index 1d328b9d..0448ad74 100644
--- a/bip-0123.mediawiki
+++ b/bip-0123.mediawiki
@@ -5,7 +5,7 @@
   Status: Deployed
   Type: Process
   Assigned: 2015-08-26
-  License: CC0-1.0 OR GNU-All-Permissive
+  License: CC0-1.0 OR FSFAP
 </pre>
 
 ==Abstract==
diff --git a/bip-0135.mediawiki b/bip-0135.mediawiki
index 7c09bbaf..2af172fe 100644
--- a/bip-0135.mediawiki
+++ b/bip-0135.mediawiki
@@ -5,7 +5,7 @@
   Status: Closed
   Type: Informational
   Assigned: 2017-03-29
-  License: CC0-1.0 OR GNU-All-Permissive
+  License: CC0-1.0 OR FSFAP
   Discussion: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2017-April/013969.html
               https://bitco.in/forum/threads/bip9-generalized-version-bits-voting-bip-genvbvoting.1968/
   Replaces: 9
diff --git a/bip-0145.mediawiki b/bip-0145.mediawiki
index b9a5ebe5..ca99ad6e 100644
--- a/bip-0145.mediawiki
+++ b/bip-0145.mediawiki
@@ -6,7 +6,7 @@
   Status: Deployed
   Type: Specification
   Assigned: 2016-01-30
-  License: BSD-2-Clause OR OPL
+  License: BSD-2-Clause OR OPUBL-1.0
 </pre>
 
 ==Abstract==
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index 8cbcfe9e..aa1329fd 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -89,7 +89,7 @@ my %AcceptableLicenses = (
 	'BSD-2-Clause' => undef,
 	'BSD-3-Clause' => undef,
 	'CC0-1.0' => undef,
-	'GNU-All-Permissive' => undef,
+	'FSFAP' => undef,
 	'MIT' => undef,
 	'CC-BY-4.0' => undef,
 	'Apache-2.0' => undef,
@@ -105,7 +105,8 @@ my %DefinedLicenses = (
 	'GPL-2.0+' => undef,
 	'LGPL-2.1' => undef,
 	'LGPL-2.1+' => undef,
-	'OPL' => undef,
+	'OPUBL-1.0' => undef,
+    # There's no identifier for "Public Domain" in the SPDX list but "PD" is used in some BIPs.
 	'PD' => undef,
 );
 my %GrandfatheredPD = map { $_ => undef } qw(9 36 37 38 42 49 50 60 65 67 69 74 80 81 83 90 99 105 107 109 111 112 113 114 122 124 125 126 130 131 132 133 140 141 142 143 144 146 147 150 151 152);