diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index d6bec58..bb5171d 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -7,10 +7,12 @@ license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11')
 makedepends=('qt5-tools')
 install=${pkgname}.install
-url="http://martchus.netai.net/"
-source=("$pkgname.tar.gz")
-md5sums=('d359927292464fcf41c8a11315ff79e2')
+url="https://github.com/Martchus/passwordmanager"
+source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/passwordmanager/archive/v${pkgver}.tar.gz")
+sha256sums=('d359927292464fcf41c8a11315ff79e2')
+
 # head end
+
 build() {
     cd $srcdir/$pkgname
     INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
diff --git a/pkgbuild/mingw-w64/PKGBUILD b/pkgbuild/mingw-w64/PKGBUILD
index 5837468..5098e26 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -1,5 +1,5 @@
 _name=passwordmanager
-pkgname=mingw-w64-$_name
+pkgname=mingw-w64-passwordmanager
 pkgver=2.0.5
 pkgrel=2
 arch=('any')
@@ -7,14 +7,16 @@ pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (mingw
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-passwordfile' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc')
-url="http://martchus.netai.net/"
-source=("${_name}.tar.gz")
-md5sums=('4e94aff9225d8873f752995c1bcc5f15')
+url="https://github.com/Martchus/passwordmanager"
+source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/passwordmanager/archive/v${pkgver}.tar.gz")
+sha256sums=('4e94aff9225d8873f752995c1bcc5f15')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 # head end
+
 build() {
     cd $srcdir/$_name
-    # build utilities for each architecture
+    # build for each architecture
     for _arch in ${_architectures}; do
         mkdir -p build-${_arch} && pushd build-${_arch}
         INSTALL_ROOT=$pkgdir/usr/ ${_arch}-qmake-qt5 -r ../${_name}.pro