diff --git a/.SRCINFO b/.SRCINFO
index 321ece7d1ea2..b1b6c71f65af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = nzbget-git
 	pkgdesc = Download from Usenet using .nzb files
-	pkgver = 21.0.r2309.5dda6b2e
+	pkgver = 21.4.r2397.6ddacdb2
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/nzbget/nzbget
+	url = https://github.com/nzbget-ng/nzbget
 	install = nzbget.install
 	arch = x86_64
 	license = GPL
 	makedepends = git
+	makedepends = autoconf
 	depends = libxml2
 	optdepends = python: run scripts
 	optdepends = unrar: unpacking archives
@@ -16,10 +17,10 @@ pkgbase = nzbget-git
 	provides = nzbget
 	provides = nzbget-systemd
 	conflicts = nzbget
-	source = nzbget-git::git+https://github.com/nzbget/nzbget.git#branch=develop
+	conflicts = nzbget-systemd
+	source = nzbget-git::git+https://github.com/nzbget-ng/nzbget.git#branch=develop
 	source = nzbget.service
 	sha256sums = SKIP
 	sha256sums = 66b2c2fbe949f6406a49674d28a2bdd258b20780ba47a586b640d6cc4d99f7c2
 
 pkgname = nzbget-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 2b4d027f45aa..5570c4c989fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,27 @@
-# Maintainer: Nicola Hinssen <nicola.hinssen@gmail.com>
+# Maintainer: selfdenial <hidden>
 # Contributor: Jan Holthuis <holthuis.jan@googlemail.com>
 
 pkgname=nzbget-git
-pkgver=21.0.r2309.5dda6b2e
+pkgver=21.4.r2397.6ddacdb2
 pkgrel=1
 epoch=1
 pkgdesc="Download from Usenet using .nzb files"
 arch=('x86_64')
-url="https://github.com/nzbget/nzbget"
+url="https://github.com/nzbget-ng/nzbget"
 license=('GPL')
 depends=('libxml2')
-makedepends=('git')
+makedepends=('git'
+             'autoconf')
 optdepends=('python: run scripts'
             'unrar: unpacking archives' 
             'p7zip: unpacking archives' 
             'par2cmdline: verificate and repair PAR 2.0 files')
 provides=('nzbget'
           'nzbget-systemd')
-conflicts=('nzbget')
+conflicts=('nzbget'
+           'nzbget-systemd')
 install=nzbget.install
-source=("$pkgname::git+https://github.com/nzbget/nzbget.git#branch=develop"
+source=("$pkgname::git+https://github.com/nzbget-ng/nzbget.git#branch=develop"
         "nzbget.service")
 sha256sums=('SKIP'
             '66b2c2fbe949f6406a49674d28a2bdd258b20780ba47a586b640d6cc4d99f7c2')
@@ -32,6 +34,7 @@ pkgver() {
 build() {
   cd "$srcdir/$pkgname"
 
+  autoreconf --install
   ./configure --prefix=/usr --sbindir='/usr/bin' --enable-parcheck --with-tlslib=OpenSSL
   make
 }