diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index 4cc6ff8..b75a091 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -7,10 +7,12 @@ license=('GPL')
 depends=('qt5-base' 'qt5-script' 'qt5-webkit' 'qtutilities' 'tagparser')
 makedepends=('qt5-tools')
 install=${pkgname}.install
-url="http://martchus.netai.net/"
-source=("$pkgname.tar.gz")
-md5sums=('3f928ba196940cc539d0af752b69339a')
+url="https://github.com/Martchus/tageditor"
+source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/tageditor/archive/v${pkgver}.tar.gz")
+sha256sums=('3f928ba196940cc539d0af752b69339a')
+
 # 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 007baf2..56d4bf2 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -1,5 +1,5 @@
 _name=tageditor
-pkgname=mingw-w64-$_name
+pkgname=mingw-w64-tageditor
 pkgver=1.1.3
 pkgrel=1
 arch=('any')
@@ -7,11 +7,13 @@ pkgdesc="Library for reading and editing meta-data of several media formats (min
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qt5-script' 'mingw-w64-qt5-webkit' 'mingw-w64-qtutilities' 'mingw-w64-tagparser')
 makedepends=('mingw-w64-gcc')
-url="http://martchus.netai.net/"
-source=("${_name}.tar.gz")
-md5sums=('4e94aff9225d8873f752995c1bcc5f15')
+url="https://github.com/Martchus/tageditor"
+source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/tageditor/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