diff --git a/data/fontrepo/TODO b/data/fontrepo/TODO
index 0167eb9c..c043f35d 100644
--- a/data/fontrepo/TODO
+++ b/data/fontrepo/TODO
@@ -1,4 +1,3 @@
-* New version of Amiri font is available
 * Siyam Rupali TTF claims GPL2+, website GPL3
 * Miriam CLM has new upstream version (maybe also Taamey Frank?)
 * KhmerOS font version number does not match upstream (v5)
diff --git a/data/fontrepo/fonts/amiri/Amiri-Bold.ttf b/data/fontrepo/fonts/amiri/Amiri-Bold.ttf
new file mode 100644
index 00000000..3850be8a
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Bold.ttf differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Bold.woff b/data/fontrepo/fonts/amiri/Amiri-Bold.woff
new file mode 100644
index 00000000..4304ed13
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Bold.woff differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Bold.woff2 b/data/fontrepo/fonts/amiri/Amiri-Bold.woff2
new file mode 100644
index 00000000..29f9f500
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Bold.woff2 differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-BoldItalic.ttf b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.ttf
new file mode 100644
index 00000000..a9aad59a
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.ttf differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff
new file mode 100644
index 00000000..d94306a0
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff2 b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff2
new file mode 100644
index 00000000..0cd8da77
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-BoldItalic.woff2 differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Italic.ttf b/data/fontrepo/fonts/amiri/Amiri-Italic.ttf
new file mode 100644
index 00000000..f831f20c
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Italic.ttf differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Italic.woff b/data/fontrepo/fonts/amiri/Amiri-Italic.woff
new file mode 100644
index 00000000..edf7d893
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Italic.woff differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Italic.woff2 b/data/fontrepo/fonts/amiri/Amiri-Italic.woff2
new file mode 100644
index 00000000..5237673f
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Italic.woff2 differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Regular.ttf b/data/fontrepo/fonts/amiri/Amiri-Regular.ttf
new file mode 100644
index 00000000..e2272113
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Regular.ttf differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Regular.woff b/data/fontrepo/fonts/amiri/Amiri-Regular.woff
new file mode 100644
index 00000000..0bc8dc3b
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Regular.woff differ
diff --git a/data/fontrepo/fonts/amiri/Amiri-Regular.woff2 b/data/fontrepo/fonts/amiri/Amiri-Regular.woff2
new file mode 100644
index 00000000..a7565226
Binary files /dev/null and b/data/fontrepo/fonts/amiri/Amiri-Regular.woff2 differ
diff --git a/data/fontrepo/fonts/amiri/amiri-bold.ttf b/data/fontrepo/fonts/amiri/amiri-bold.ttf
deleted file mode 100644
index a97bf9cf..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-bold.ttf and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-bold.woff b/data/fontrepo/fonts/amiri/amiri-bold.woff
deleted file mode 100644
index 8688b15c..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-bold.woff and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-bold.woff2 b/data/fontrepo/fonts/amiri/amiri-bold.woff2
deleted file mode 100644
index 5f8b1ba3..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-bold.woff2 and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf b/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf
deleted file mode 100644
index d3e6cdca..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff b/data/fontrepo/fonts/amiri/amiri-boldslanted.woff
deleted file mode 100644
index aee55823..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff2 b/data/fontrepo/fonts/amiri/amiri-boldslanted.woff2
deleted file mode 100644
index f09aeeef..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff2 and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-regular.ttf b/data/fontrepo/fonts/amiri/amiri-regular.ttf
deleted file mode 100644
index a6df4284..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-regular.ttf and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-regular.woff b/data/fontrepo/fonts/amiri/amiri-regular.woff
deleted file mode 100644
index 6f72f646..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-regular.woff and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-regular.woff2 b/data/fontrepo/fonts/amiri/amiri-regular.woff2
deleted file mode 100644
index 42687909..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-regular.woff2 and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.ttf b/data/fontrepo/fonts/amiri/amiri-slanted.ttf
deleted file mode 100644
index c86e2a72..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-slanted.ttf and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.woff b/data/fontrepo/fonts/amiri/amiri-slanted.woff
deleted file mode 100644
index 9a303533..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-slanted.woff and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.woff2 b/data/fontrepo/fonts/amiri/amiri-slanted.woff2
deleted file mode 100644
index 8831cd34..00000000
Binary files a/data/fontrepo/fonts/amiri/amiri-slanted.woff2 and /dev/null differ
diff --git a/data/fontrepo/fonts/amiri/font.ini b/data/fontrepo/fonts/amiri/font.ini
index 86e80260..b8ff8f5f 100644
--- a/data/fontrepo/fonts/amiri/font.ini
+++ b/data/fontrepo/fonts/amiri/font.ini
@@ -1,32 +1,32 @@
 [Amiri]
 languages=ar, arb, ckb
-version=0.107
+version=1.000
 license=OFL-1.1
 licensefile=OFL.txt
 request-url=https://phabricator.wikimedia.org/T43359, https://phabricator.wikimedia.org/T59767
 url=http://amirifont.org
-ttf=amiri-regular.ttf
-woff=amiri-regular.woff
-woff2=amiri-regular.woff2
+ttf=Amiri-Regular.ttf
+woff=Amiri-Regular.woff
+woff2=Amiri-Regular.woff2
 bold=Amiri Bold
 italic=Amiri Italic
 bolditalic=Amiri Bold Italic
 
 [Amiri Bold]
-ttf=amiri-bold.ttf
-woff=amiri-bold.woff
-woff2=amiri-bold.woff2
+ttf=Amiri-Bold.ttf
+woff=Amiri-Bold.woff
+woff2=Amiri-Bold.woff2
 fontweight=bold
 
 [Amiri Italic]
-ttf=amiri-slanted.ttf
-woff=amiri-slanted.woff
-woff2=amiri-slanted.woff2
+ttf=Amiri-Italic.ttf
+woff=Amiri-Italic.woff
+woff2=Amiri-Italic.woff2
 fontstyle=italic
 
 [Amiri Bold Italic]
-ttf=amiri-boldslanted.ttf
-woff=amiri-boldslanted.woff
-woff2=amiri-boldslanted.woff2
+ttf=Amiri-BoldItalic.ttf
+woff=Amiri-BoldItalic.woff
+woff2=Amiri-BoldItalic.woff2
 fontstyle=italic
 fontweight=bold
diff --git a/resources/js/ext.uls.webfonts.repository.js b/resources/js/ext.uls.webfonts.repository.js
index 0f445464..fb15c71a 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -459,8 +459,8 @@
 			"woff2": "Alef/Alef-Bold.woff2?7c873"
 		},
 		"Amiri": {
-			"woff": "amiri/amiri-regular.woff?e8973",
-			"woff2": "amiri/amiri-regular.woff2?1f55e",
+			"woff": "amiri/Amiri-Regular.woff?3d608",
+			"woff2": "amiri/Amiri-Regular.woff2?62666",
 			"variants": {
 				"bold": "Amiri Bold",
 				"bolditalic": "Amiri Bold Italic",
@@ -469,19 +469,19 @@
 		},
 		"Amiri Bold": {
 			"fontweight": "bold",
-			"woff": "amiri/amiri-bold.woff?63eb0",
-			"woff2": "amiri/amiri-bold.woff2?a0e74"
+			"woff": "amiri/Amiri-Bold.woff?00982",
+			"woff2": "amiri/Amiri-Bold.woff2?ffea9"
 		},
 		"Amiri Bold Italic": {
 			"fontweight": "bold",
 			"fontstyle": "italic",
-			"woff": "amiri/amiri-boldslanted.woff?44410",
-			"woff2": "amiri/amiri-boldslanted.woff2?b0128"
+			"woff": "amiri/Amiri-BoldItalic.woff?52cb9",
+			"woff2": "amiri/Amiri-BoldItalic.woff2?c947c"
 		},
 		"Amiri Italic": {
 			"fontstyle": "italic",
-			"woff": "amiri/amiri-slanted.woff?7d658",
-			"woff2": "amiri/amiri-slanted.woff2?a90a0"
+			"woff": "amiri/Amiri-Italic.woff?dd356",
+			"woff2": "amiri/Amiri-Italic.woff2?2803c"
 		},
 		"Artaxerxes": {
 			"woff": "Artaxerxes/Artaxerxes.woff?c1ed7",