diff --git a/mkvtoolnix/trunk/PKGBUILD b/mkvtoolnix/trunk/PKGBUILD
index 6a6c170b4c2..8e75448a687 100644
--- a/mkvtoolnix/trunk/PKGBUILD
+++ b/mkvtoolnix/trunk/PKGBUILD
@@ -11,7 +11,7 @@ pkgver=47.0.0
 pkgrel=1
 pkgdesc='Set of tools to create, edit and inspect Matroska files'
 arch=(x86_64)
-url=https://www.bunkus.org/videotools/mkvtoolnix/
+url=https://mkvtoolnix.download
 license=(GPL2)
 makedepends=(
   boost
@@ -21,7 +21,6 @@ makedepends=(
   file
   flac
   fmt
-  git
   libebml
   libmatroska
   libogg
@@ -30,24 +29,18 @@ makedepends=(
   ruby-rake
   zlib
 )
-source=(git+https://gitlab.com/mbunkus/mkvtoolnix.git#tag=005224b68b44751ce32e509acdb56ba64dea630e)
-sha256sums=(SKIP)
-
-pkgver() {
-  cd mkvtoolnix
-
-  git describe --tags | sed 's/release-//'
-}
+source=(https://mkvtoolnix.download/sources/${pkgbase}-${pkgver}.tar.xz{,.sig})
+validpgpkeys=("D9199745B0545F2E8197062B0F92290A445B9007") # Moritz Bunkus
+sha256sums=('8b7744203758025585b28200906c4b85716a6b1b95fed77cc520f9ae59c2ae44'
+            'SKIP')
 
 prepare() {
-  cd mkvtoolnix
-
+  cd ${pkgbase}-${pkgver}
   ./autogen.sh
 }
 
 build() {
-  cd mkvtoolnix
-
+  cd ${pkgbase}-${pkgver}
   ./configure \
     --prefix=/usr \
     --disable-update-check
@@ -67,8 +60,7 @@ package_mkvtoolnix-cli() {
     libvorbis.so
   )
 
-  cd mkvtoolnix
-
+  cd ${pkgbase}-${pkgver}
   rake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/share/{applications,icons,metainfo,mime,mkvtoolnix}
   find "${pkgdir}" -name mkvtoolnix-gui* -delete
@@ -83,8 +75,7 @@ package_mkvtoolnix-gui() {
     qt5-multimedia
   )
 
-  cd mkvtoolnix
-
+  cd ${pkgbase}-${pkgver}
   rake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/share/locale
   for t in mkv{extract,info,merge,propedit}; do