diff --git a/composer.json b/composer.json
index eca171e8..690387f0 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
 	],
 	"homepage": "https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector",
 	"license": [
-		"GPL-2.0+",
+		"GPL-2.0-or-later",
 		"MIT"
 	],
 	"support": {
diff --git a/data/fontrepo/fonts/Artaxerxes/font.ini b/data/fontrepo/fonts/Artaxerxes/font.ini
index d09b45ac..e97253ae 100644
--- a/data/fontrepo/fonts/Artaxerxes/font.ini
+++ b/data/fontrepo/fonts/Artaxerxes/font.ini
@@ -1,7 +1,7 @@
 [Artaxerxes]
 languages=peo*
 version=1.400
-license=GPL-2.0-with-font-exception
+license=GPL-2.0-or-later WITH Font-exception-2.0
 licensefile=gpl-2.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/110534
 url=https://github.com/PersianWikipedia/artaxerxes
diff --git a/data/fontrepo/fonts/FreeFontThana/font.ini b/data/fontrepo/fonts/FreeFontThana/font.ini
index 1735a1ac..7806d7c9 100644
--- a/data/fontrepo/fonts/FreeFontThana/font.ini
+++ b/data/fontrepo/fonts/FreeFontThana/font.ini
@@ -1,7 +1,7 @@
 [FreeFont-Thaana]
 languages=dv*
 version=1.0
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 url=www.gnu.org/software/freefont
 request-url=https://phabricator.wikimedia.org/T44812
diff --git a/data/fontrepo/fonts/KhmerOS/font.ini b/data/fontrepo/fonts/KhmerOS/font.ini
index 152ad1a4..0a974bdd 100644
--- a/data/fontrepo/fonts/KhmerOS/font.ini
+++ b/data/fontrepo/fonts/KhmerOS/font.ini
@@ -1,6 +1,6 @@
 [KhmerOS]
 languages=km
 version=1.10
-license=LGPL-2.0.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 url=http://www.khmeros.info/drupal612/en/fonts
diff --git a/data/fontrepo/fonts/KhmerOSbattambang/font.ini b/data/fontrepo/fonts/KhmerOSbattambang/font.ini
index 83db3697..93916a90 100644
--- a/data/fontrepo/fonts/KhmerOSbattambang/font.ini
+++ b/data/fontrepo/fonts/KhmerOSbattambang/font.ini
@@ -1,7 +1,7 @@
 [KhmerOSbattambang]
 languages=km*
 version=1.10
-license=LGPL-2.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 request-url=https://www.mediawiki.org/wiki/Special:Code/MediaWiki/87161
 url=http://www.khmeros.info/drupal612/en/fonts
diff --git a/data/fontrepo/fonts/MiriamCLM/font.ini b/data/fontrepo/fonts/MiriamCLM/font.ini
index f4fa7b38..f1a3c350 100644
--- a/data/fontrepo/fonts/MiriamCLM/font.ini
+++ b/data/fontrepo/fonts/MiriamCLM/font.ini
@@ -1,6 +1,6 @@
 [Miriam CLM]
 languages=he
 version=0.130
-license=GPL-2.0+
+license=GPL-2.0-or-later
 licensefile=gpl-2.0.txt
 url=http://culmus.sourceforge.net/
diff --git a/data/fontrepo/fonts/Myanmar3/font.ini b/data/fontrepo/fonts/Myanmar3/font.ini
index c6110d0b..2384aa00 100644
--- a/data/fontrepo/fonts/Myanmar3/font.ini
+++ b/data/fontrepo/fonts/Myanmar3/font.ini
@@ -1,6 +1,6 @@
 [Myanmar3]
 languages=my
 version=3.0
-license=LGPL-2.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 url=http://code.google.com/p/myanmar3source/
diff --git a/data/fontrepo/fonts/NafeesWeb/font.ini b/data/fontrepo/fonts/NafeesWeb/font.ini
index 4ced3482..0e8eb1dd 100644
--- a/data/fontrepo/fonts/NafeesWeb/font.ini
+++ b/data/fontrepo/fonts/NafeesWeb/font.ini
@@ -1,7 +1,7 @@
 [NafeesWeb]
 languages=ur
 version=1.2
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 request-url=https://phabricator.wikimedia.org/T48693
 ;URL seems broken but, Debian has this font confirming its license validity.
diff --git a/data/fontrepo/fonts/Nazli/font.ini b/data/fontrepo/fonts/Nazli/font.ini
index 6ac00b9e..7a420672 100644
--- a/data/fontrepo/fonts/Nazli/font.ini
+++ b/data/fontrepo/fonts/Nazli/font.ini
@@ -1,7 +1,7 @@
 [Nazli]
 languages=fa
 version=0.4
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/76349/
 url=http://persian-computing.org/
diff --git a/data/fontrepo/fonts/OskiEast/font.ini b/data/fontrepo/fonts/OskiEast/font.ini
index 8146090a..4113416d 100644
--- a/data/fontrepo/fonts/OskiEast/font.ini
+++ b/data/fontrepo/fonts/OskiEast/font.ini
@@ -1,7 +1,7 @@
 [OskiEast]
 languages=cr*, iu
 version=2.200
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/80548/
 url=http://www.languagegeek.com/font/fontdownload.html#AlgonAndInu
diff --git a/data/fontrepo/fonts/Pagul/font.ini b/data/fontrepo/fonts/Pagul/font.ini
index 24c1cf62..a4c8c4db 100644
--- a/data/fontrepo/fonts/Pagul/font.ini
+++ b/data/fontrepo/fonts/Pagul/font.ini
@@ -1,7 +1,7 @@
 [Pagul]
 languages=saz*
 version=1.0
-license=GPL-3.0.0-with-font-exception
+license=GPL-3.0-only WITH Font-exception-2.0
 licensefile=gpl-3.0.txt
 request-url=https://www.mediawiki.org/wiki/Special:Code/MediaWiki/87738
 url=http://sourceforge.net/projects/pagul/
diff --git a/data/fontrepo/fonts/Shapour/font.ini b/data/fontrepo/fonts/Shapour/font.ini
index c9f25d9e..6913d812 100644
--- a/data/fontrepo/fonts/Shapour/font.ini
+++ b/data/fontrepo/fonts/Shapour/font.ini
@@ -1,7 +1,7 @@
 [Shapour]
 languages=pal*
 version=001.000
-license=GPL-3.0+
+license=GPL-3.0-or-later
 licensefile=gpl-3.0.txt
 request-url=https://phabricator.wikimedia.org/T46076
 url=https://github.com/behaafarid/shapour_font
diff --git a/data/fontrepo/fonts/SiyamRupali/font.ini b/data/fontrepo/fonts/SiyamRupali/font.ini
index 938040c7..b00b93cc 100644
--- a/data/fontrepo/fonts/SiyamRupali/font.ini
+++ b/data/fontrepo/fonts/SiyamRupali/font.ini
@@ -1,7 +1,7 @@
 [Siyam Rupali]
 languages=bn*, bpy*
 version=1.070
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=https://phabricator.wikimedia.org/T35599, https://phabricator.wikimedia.org/T39863
 url=https://github.com/potasiyam/Siyam-Rupali
diff --git a/data/fontrepo/fonts/TaameyFrankCLM/font.ini b/data/fontrepo/fonts/TaameyFrankCLM/font.ini
index 3b144fa4..ddd61aea 100644
--- a/data/fontrepo/fonts/TaameyFrankCLM/font.ini
+++ b/data/fontrepo/fonts/TaameyFrankCLM/font.ini
@@ -1,7 +1,7 @@
 [Taamey Frank CLM]
 languages=hbo*, he
 version=0.110
-license=GPL-2.0+
+license=GPL-2.0-or-later
 licensefile=gpl-2.0.txt
 request-url=https://he.wikisource.org/wiki/%D7%95%D7%99%D7%A7%D7%99%D7%98%D7%A7%D7%A1%D7%98:%D7%9E%D7%96%D7%A0%D7%95%D7%9F/%D7%90%D7%A8%D7%9B%D7%99%D7%95%D7%9F_%D7%99%D7%95%D7%9C%D7%99_2013#.D7.92.D7.95.D7.A4.D7.A0.D7.99.D7.9D.21
 url=http://culmus.sourceforge.net/
diff --git a/data/fontrepo/fonts/lklug/font.ini b/data/fontrepo/fonts/lklug/font.ini
index 6de0d4b8..83e7f636 100644
--- a/data/fontrepo/fonts/lklug/font.ini
+++ b/data/fontrepo/fonts/lklug/font.ini
@@ -1,7 +1,7 @@
 [lklug]
 languages=si
 version=0.6
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 ; URL is 404 at present. Current version is derived from Debian.
 url=http://www.lug.lk/fonts/lklug
diff --git a/data/fontrepo/fonts/saweri/font.ini b/data/fontrepo/fonts/saweri/font.ini
index 8008abfd..912f02ff 100644
--- a/data/fontrepo/fonts/saweri/font.ini
+++ b/data/fontrepo/fonts/saweri/font.ini
@@ -1,7 +1,7 @@
 [Saweri]
 languages=bug*, mak*
 version=2
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=http://www.mediawiki.org/wiki/Special:Code/MediaWiki/111928
 url=https://sites.google.com/site/niariot87/
diff --git a/data/fontrepo/licenses/README b/data/fontrepo/licenses/README
index ed0b35d0..eee9519f 100644
--- a/data/fontrepo/licenses/README
+++ b/data/fontrepo/licenses/README
@@ -5,14 +5,13 @@ Common Licenses
 ---------------
 Apache-2.0
 CC-BY-3.0
-GPL-2.0
-GPL-2.0+
-GPL-2.0-with-font-exception
-GPL-3.0
-GPL-3.0+
-GPL-3.0-with-font-exception
-LGPL-2.0.1+
-LGPL-2.1+
+GPL-2.0-only
+GPL-2.0-or-later
+GPL-2.0-or-later WITH Font-exception-2.0
+GPL-3.0-only
+GPL-3.0-or-later
+GPL-3.0-only WITH Font-exception-2.0
+LGPL-2.1-or-later
 OFL-1.1
 
 Other
diff --git a/maintenance/ULSCompactLinksDisablePref.php b/maintenance/ULSCompactLinksDisablePref.php
index ff182240..ab2a2ee4 100644
--- a/maintenance/ULSCompactLinksDisablePref.php
+++ b/maintenance/ULSCompactLinksDisablePref.php
@@ -4,7 +4,7 @@
  * preference for appropriate users
  *
  * @copyright 2017 Wikimedia Language team and others; see AUTHORS.txt
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Niklas Laxström
  * @author Amir E. Aharoni
  * Based on autodisablePref.php from the VisualEditor repository by Alex Monk
diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js
index d3edf7b7..393b2119 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -13,7 +13,7 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU GPL-2.0+
+ * @licence GNU GPL-2.0-or-later
  * @licence MIT License
  */
 
diff --git a/scripts/compile-font-repo.php b/scripts/compile-font-repo.php
index c5bff8e6..2340a83b 100644
--- a/scripts/compile-font-repo.php
+++ b/scripts/compile-font-repo.php
@@ -2,7 +2,7 @@
 /**
  *
  * @author Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @file
  */
 
diff --git a/scripts/generate-font-test-page.php b/scripts/generate-font-test-page.php
index 11d14098..d892eb41 100644
--- a/scripts/generate-font-test-page.php
+++ b/scripts/generate-font-test-page.php
@@ -2,7 +2,7 @@
 /**
  *
  * @author Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @file
  */