diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index 0f59744..64bd0d7 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -1,15 +1,19 @@
+# Maintainer: Martchus <martchus@gmx.net>
 pkgname=c++utilities
 pkgver=1.0.4
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Collection of utility classes and functions used by Tageditor, Video downloader and Password Manager."
+pkgdesc="Common C++ classes and routines used by my applications such
+as argument parser, IO and conversion utilities."
 license=('GPL')
 depends=('qt5-base')
 makedepends=
-url="http://martchus.netai.net/"
-source=("$pkgname.tar.gz")
-md5sums=('4e94aff9225d8873f752995c1bcc5f15')
+url="https://github.com/Martchus/cpp-utilities"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v${pkgver}.tar.gz")
+sha256sums=('4e94aff9225d8873f752995c1bcc5f15')
+
 # 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 594e7be..302f336 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -1,21 +1,24 @@
 _name=c++utilities
-pkgname=mingw-w64-$_name
+pkgname=mingw-w64-c++utilities
 pkgver=1.0.4
 pkgrel=1
 arch=('any')
-pkgdesc="Collection of utility classes and functions used by Tageditor, Video downloader and Password Manager (mingw-w64)."
+pkgdesc="Common C++ classes and routines used by my applications such
+as argument parser, IO and conversion utilities (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc')
-url="http://martchus.netai.net/"
-source=("$_name.tar.gz")
-md5sums=('4e94aff9225d8873f752995c1bcc5f15')
+url="https://github.com/Martchus/cpp-utilities"
+source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/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