diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index 17c378e..bd1610b 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -7,10 +7,12 @@ license=('GPL')
 depends=('c++utilities' 'openssl')
 makedepends=('qt5-base')
 install=
-url="http://martchus.netai.net/"
-source=("$pkgname.tar.gz")
-md5sums=('d359927292464fcf41c8a11315ff79e2')
+url="https://github.com/Martchus/passwordfile"
+source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/passwordfile/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 0f5e822..2bd0fd3 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -1,5 +1,5 @@
 _name=passwordfile
-pkgname=mingw-w64-$_name
+pkgname=mingw-w64-passwordfile
 pkgver=2.0.3
 pkgrel=3
 arch=('any')
@@ -7,15 +7,17 @@ pkgdesc="A library for reading and writing AES-256-CBC encrypted password files
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc')
-url="http://martchus.netai.net/"
-source=("${_name}.tar.gz")
-md5sums=('4e94aff9225d8873f752995c1bcc5f15')
+url="https://github.com/Martchus/passwordfile"
+source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/passwordfile/archive/v${pkgver}.tar.gz")
+sha256sums=('4e94aff9225d8873f752995c1bcc5f15')
 options=('staticlibs' '!strip')
 _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