diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 86fbe5df..65cab69d 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,46 +4,50 @@
 # Contributor: Thomas Bächler <thomas.archlinux.org>
 
 pkgname=ntfs-3g
-_pkgname=ntfs-3g_ntfsprogs
 pkgver=2021.8.22
 pkgrel=1
 pkgdesc='NTFS filesystem driver and utilities'
-url='https://www.tuxera.com/community/open-source-ntfs-3g/'
+url='https://www.tuxera.com/company/open-source/'
 arch=('x86_64')
 license=('GPL2')
-depends=('util-linux' 'fuse2')
-source=("https://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz")
-sha256sums=('55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb')
-
+depends=('fuse2' 'gnutls' 'util-linux')
+makedepends=('git')
 conflicts=('ntfsprogs')
 provides=('ntfsprogs')
 replaces=('ntfsprogs')
-
-prepare() {
-  cd ${_pkgname}-${pkgver}
-  sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i {ntfsprogs,src}/Makefile.in
-}
+source=("ntfs-3g::git+https://github.com/tuxera/ntfs-3g#tag=${pkgver}")
+sha256sums=('SKIP')
 
 build() {
-  cd ${_pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sbin=/usr/bin \
-    --mandir=/usr/share/man \
-    --disable-ldconfig \
-    --disable-static \
-    --with-fuse=external \
-    --enable-xattr-mappings \
-    --enable-posix-acls \
-    --enable-extras \
-    --enable-crypto \
+  cd ntfs-3g
 
+  local configure_options=(
+    --prefix=/usr
+    --sbin=/usr/bin
+    --mandir=/usr/share/man
+    --disable-ldconfig
+    --disable-static
+    --with-fuse=external
+    --enable-xattr-mappings
+    --enable-posix-acls
+    --enable-extras
+    --enable-crypto
+    --disable-mount-helper
+  )
+
+  autoreconf -vfi
+  ./configure "${configure_options[@]}"
   make
 }
 
 package_ntfs-3g() {
-  cd ${_pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+  cd ntfs-3g
+
+  make DESTDIR="${pkgdir}" rootbindir=/usr/bin install
   rm "${pkgdir}"/usr/share/man/man8/ntfsfallocate.8 # uninstalled binary
-  ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
+
+  # mount helpers
+  ln -s /usr/bin/lowntfs-3g "${pkgdir}"/usr/bin/mount.lowntfs-3g
+  ln -s /usr/bin/ntfs-3g "${pkgdir}"/usr/bin/mount.ntfs
+  ln -s /usr/bin/ntfs-3g "${pkgdir}"/usr/bin/mount.ntfs-3g
 }