diff --git a/libguess/PKGBUILD b/libguess/PKGBUILD
index aaf941279..39ec08458 100644
--- a/libguess/PKGBUILD
+++ b/libguess/PKGBUILD
@@ -1,30 +1,24 @@
 pkgname=libguess
-pkgver=1.1
-pkgrel=3
+pkgver=1.2
+_commit=13c43adc7e6bfcf021057fd99feb661e8fa80a2d
+pkgrel=1
 pkgdesc='High-speed character set detection library'
 url='http://atheme.org/projects/libguess.html'
 license=('custom')
 depends=('libmowgli')
 arch=('x86_64')
-source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('e3c9ad3102c9447c591131674135795fb012e073d92e887a2b05c9bbbcbe913f')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  sed 's/libmowgli >= 0.9.50/libmowgli-2/g' -i configure
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/kaniini/libguess/archive/$_commit.tar.gz")
+sha256sums=('539137055be10b72bad8c913cdbafab7fd28a1caae462110d06d3c17481b32db')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
+  cd ${pkgname}-$_commit
+  ./autogen.sh
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
+  cd ${pkgname}-$_commit
   make DESTDIR="${pkgdir}" install
   install -D COPYING "${pkgdir}"/usr/share/licenses/libguess/COPYING
 }
diff --git a/libmowgli/PKGBUILD b/libmowgli/PKGBUILD
index ba187d94c..414e6cf09 100644
--- a/libmowgli/PKGBUILD
+++ b/libmowgli/PKGBUILD
@@ -1,26 +1,24 @@
 pkgname=libmowgli
-pkgver=2.0.0
-pkgrel=3
+_pkgname=libmowgli-2
+pkgver=2.1.0
+pkgrel=1
 pkgdesc='Performance and usability-oriented extensions to C'
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
 arch=('x86_64')
 depends=('openssl')
 makedepends=('git')
-source=("${pkgname}-${pkgver}::git+https://github.com/atheme/libmowgli-2.git#tag=${pkgname}-${pkgver}")
-sha256sums=('SKIP')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atheme/libmowgli-2/archive/v${pkgver}.tar.gz")
+sha256sums=('46ef60c642c457a5d0e36bfc8c277e74d2ebf4ab9cbc4e40153781ed4ab0fe7d')
  
 build() {
-  cd ${pkgname}-${pkgver}
-
+  cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
  
 package() {
-  cd ${pkgname}-${pkgver}
-
+  cd ${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
-
diff --git a/mpv/PKGBUILD b/mpv/PKGBUILD
index 97e00a3b8..5ef4b79d9 100644
--- a/mpv/PKGBUILD
+++ b/mpv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mpv
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A movie player and encoder for linux, based on MPlayer/mplayer2"
 arch=('x86_64')
 license=('LGPL3')