diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index aa35f581da2..5e163c0d6d0 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fontconfig
-pkgver=2.15.0
-pkgrel=5
+pkgver=2.17.1
+pkgrel=0
 pkgdesc="Library for configuring and customizing font access"
 url="https://www.freedesktop.org/wiki/Software/fontconfig"
 arch="all"
@@ -11,7 +11,7 @@ makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev docbook2x"
 checkdepends="bash json-c-dev uuidgen curl"
 triggers="$pkgname.trigger=/usr/share/fonts/*"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$pkgver.tar.gz
+source="https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$pkgver/fontconfig-$pkgver.tar.xz
 	fix-arithmetic.patch
 	"
 
@@ -49,6 +49,6 @@ package() {
 }
 
 sha512sums="
-4feb02935d94002ed0aba5b9e44bab47c14bbc0ecfcdcdb14c9004681109cef51415cd2368e959f8c4bd2e67ff9e8fcf45102a4bd8728b2f50b3c56723fcb81c  fontconfig-2.15.0.tar.gz
-9e0a010c8075085dedfe6bda1b26d8a7c693091e3ba5e823da8dd79468116c7b6e4a94b1173649999075cf9532bfc81adc97d0182bbff7635e9699bc44d6aa1c  fix-arithmetic.patch
+c09c1f041f61ee0d220ff906a86b5c4b329106dc96f8c04b23f8fdeb480df626717fe3613bccb41cb39e86334078139322710377f5ddaa3abe48569e798161c9  fontconfig-2.17.1.tar.xz
+9cb83535a49ddacf526a040d5407382a8d92b077200f24da983999dc81aa0966d6878bab5bf7c2d3bc6a50d2ca6edb8b56142362d34919b18cb947415384f25b  fix-arithmetic.patch
 "
diff --git a/main/fontconfig/fix-arithmetic.patch b/main/fontconfig/fix-arithmetic.patch
index 84aea7793a1..97b639df41f 100644
--- a/main/fontconfig/fix-arithmetic.patch
+++ b/main/fontconfig/fix-arithmetic.patch
@@ -1,11 +1,21 @@
 --- a/test/run-test.sh
 +++ b/test/run-test.sh
-@@ -388,7 +388,7 @@
+@@ -453,7 +453,7 @@
+ if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+     # epoch 0 has special meaning. increase to avoid epoch 0
+     old_epoch=${SOURCE_DATE_EPOCH}
+-    SOURCE_DATE_EPOCH=$(("$SOURCE_DATE_EPOCH" + 1))
++    SOURCE_DATE_EPOCH=$((SOURCE_DATE_EPOCH + 1))
+ fi
+ if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
+     touch -m -t "$(fdate ${SOURCE_DATE_EPOCH})" "$FONTDIR"
+@@ -486,7 +486,7 @@
+ s!@CACHEDIR@!$MYOWNCACHEDIR!" < "$TESTDIR"/fonts.conf.in > "$BUILDTESTDIR"/my-fonts.conf
  
  if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
-   old_epoch=${SOURCE_DATE_EPOCH}
 -  SOURCE_DATE_EPOCH=$(("$SOURCE_DATE_EPOCH" + 1))
-+  SOURCE_DATE_EPOCH=$(( SOURCE_DATE_EPOCH + 1))
++  SOURCE_DATE_EPOCH=$((SOURCE_DATE_EPOCH + 1))
  fi
- FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCCACHE -f "$FONTDIR"
+ FONTCONFIG_FILE="$BUILDTESTDIR"/my-fonts.conf $FCCACHE -f "$FONTDIR"
  if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+