diff --git a/bento4/default/PKGBUILD b/bento4/default/PKGBUILD
index b8198220..eaa963ce 100644
--- a/bento4/default/PKGBUILD
+++ b/bento4/default/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Martchus <youremail@domain.com>
 pkgname=bento4
-pkgver=1.4.3.604
-_pkgverstr=1-4-3-604
+pkgver=1.4.3.607
+_pkgverstr=1.4.3-607
 pkgrel=1
 pkgdesc="Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files."
 arch=('i686' 'x86_64')
-url="http://www.bento4.com/"
+url="https://www.bento4.com/"
 license=('GPL')
+makedepends=('cmake')
 optdepends=('python')
-source=("http://zebulon.bok.net/Bento4/source/Bento4-SRC-$_pkgverstr.zip")
-md5sums=('2803b1c0a55c37a723ded7ff44dbfedc')
+source=("https://github.com/axiomatic-systems/Bento4/archive/v${_pkgverstr}.tar.gz")
+md5sums=('9c5ebea9e0cef667c214d7df38d00b4e')
 _config="Release"
 if [ $CARCH == "i686" ]; then
   _arch="x86"
@@ -18,22 +19,31 @@ else
 fi
 
 build() {
-  cd "Build/Targets/$_arch-unknown-linux/"
+  cd "${srcdir}/Bento4-${_pkgverstr}/Build/Targets/$_arch-unknown-linux/"
   sed -i "6s/.*/AP4_BUILD_CONFIG = $_config/" ../../Makefiles/Bootstrap.mak
-  make sdk
+  make sdk AP4_BUILD_CONFIG=$_config
+  # make shared library manually
+  cd "${srcdir}/Bento4-${_pkgverstr}/Build/Targets/$_arch-unknown-linux/$_config/SDK/lib"
+  mkdir shared
+  cd shared
+  ar x ../libAP4.a
+  g++ -shared -Wl,-soname,libAP4.so.$pkgver -o libAP4.so.$pkgver *.o
 }
 
 package() {
-  cd "Build/Targets/$_arch-unknown-linux/$_config/SDK"
-  mkdir -p $pkgdir/usr/bin/
-  mkdir -p $pkgdir/usr/lib/
-  mkdir -p $pkgdir/usr/include/$pkgname/
+  cd "${srcdir}/Bento4-${_pkgverstr}/Build/Targets/$_arch-unknown-linux/$_config/SDK"
+  mkdir -p "$pkgdir/usr/bin/"
+  mkdir -p "$pkgdir/usr/lib/"
+  mkdir -p "$pkgdir/usr/include/$pkgname/"
   pushd ./bin
   for file in *; do
     # prefix binaries with "bento4-" to avoid conflicts
     install -m755 -D "./$file" "$pkgdir/usr/bin/bento4-$file"
   done
   popd
-  install -m644 -D ./lib/*.a $pkgdir/usr/lib/
-  install -m644 -D ./include/*.h $pkgdir/usr/include/$pkgname/
+  install -m644 -D ./lib/*.a "$pkgdir/usr/lib/" # static lib is usually removed anyways
+  install -m644 -D ./lib/shared/*.so.* "$pkgdir/usr/lib/"
+  install -m644 -D ./include/*.h "$pkgdir/usr/include/$pkgname/"
+  cd "$pkgdir/usr/lib/"
+  ln -s libAP4.so.$pkgver libAP4.so
 } 
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index 2aca60ec..a3bed19c 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=repoindex
 pkgname=('repoindex' 'repoindex-web')
-pkgver=0.0.2
-pkgrel=2
+pkgver=0.1.1
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Provides a web interface to browse Arch Linux package repositories."
 license=('GPL')
-depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities')
+depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities')
 makedepends=('cmake')
 backup=("etc/${_reponame}.conf")
 url="https://github.com/Martchus/${_reponame}"
@@ -31,8 +31,8 @@ package_repoindex() {
   # make directories for cache and data
   mkdir -p "$pkgdir/var/cache/$_reponame"
   chown http:http "$pkgdir/var/cache/$_reponame"
-  mkdir -p "$pkgdir/var/lib/$_reponame"
-  chown http:http "$pkgdir/var/lib/$_reponame"
+  mkdir -p "$pkgdir/var/lib/$_reponame/sync"
+  chown http:http "$pkgdir/var/lib/$_reponame/"{,sync}
   mkdir -p "$pkgdir/etc"
   cp "$pkgdir/usr/share/$_reponame/skel/repoindex.conf.js" "$pkgdir/etc/repoindex.conf"
 }
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index 839f394b..6d120e7c 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -8,6 +8,7 @@ pkgdesc="Provides a web interface to browse Arch Linux package repositories (git
 license=('GPL')
 depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities')
 makedepends=('cmake' 'git')
+backup=("etc/${_reponame}.conf")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
 source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
diff --git a/subtitlecomposer/git/PKGBUILD b/subtitlecomposer/git/PKGBUILD
index 4a88a1f3..55978322 100644
--- a/subtitlecomposer/git/PKGBUILD
+++ b/subtitlecomposer/git/PKGBUILD
@@ -1,5 +1,4 @@
 # Maintainer: Mladen Milinkovic <maxrd2@smoothware.net>
-# Contributor: Mladen Milinkovic <maxrd2@smoothware.net>
 # Contributor: Martchus <martchus@gmx.net>
 
 # You can install/update Subtitle Composer from repository if you add following to /etc/pacman.conf