diff --git a/pkgbuilds.pro b/pkgbuilds.pro
index 9f836d0b..f7b34ab5 100644
--- a/pkgbuilds.pro
+++ b/pkgbuilds.pro
@@ -47,6 +47,7 @@ OTHER_FILES += \
     isoviewer/default/isoviewer.sh \
     dbus-soundrecorder/default/PKGBUILD \
     subtitlecomposer/default/PKGBUILD \
+    subtitlecomposer/default/subtitlecomposer.install \
     subtitlecomposer/git/PKGBUILD \
     subtitlecomposer/git/subtitlecomposer.install \
     brother-mfc-j4410dw/default/PKGBUILD \
diff --git a/subtitlecomposer/default/PKGBUILD b/subtitlecomposer/default/PKGBUILD
index d76ed272..a167fec0 100644
--- a/subtitlecomposer/default/PKGBUILD
+++ b/subtitlecomposer/default/PKGBUILD
@@ -8,31 +8,32 @@
 # Server = http://smoothware.net/$repo/$arch
 
 pkgname=subtitlecomposer
-pkgver=0.5.7
-pkgrel=3
+pkgver=0.5.8
+pkgrel=1
 pkgdesc="A KDE subtitle editor"
 arch=('i686' 'x86_64')
-url="https://github.com/maxrd2/subtitlecomposer"
+url="https://github.com/maxrd2/${pkgname}"
 license=('GPL')
-depends=('kdelibs' 'gettext')
-makedepends=('cmake' 'automoc4' 'git')
-conflicts=('subtitlecomposer-git')
-optdepends=('mplayer: for MPlayer backend'
-            'mplayer2: for MPlayer backend'
-            'gstreamer: for GStreamer backend'
-            'xine-lib: for Xine backend')
-source=("https://github.com/maxrd2/subtitlecomposer/archive/v${pkgver}.tar.gz")
-md5sums=('9e1fef4dca5a15e5c0435f1b099d4ab4')
+depends=('kcoreaddons' 'sonnet' 'kcodecs' 'kio' 'kross' 'kxmlgui' 'ki18n')
+# Comment/uncomment the following dependencies to disable/enable support for
+# MPV, gstreamer and/or Xine backend.
+# These are not optdepends as they must be present at build time.
+#depends+=('mpv')
+depends+=('gstreamer')
+depends+=('xine-lib')
+makedepends=('extra-cmake-modules')
+install=${pkgname}.install
+optdepends=('mplayer: for MPlayer backend')
+source=("https://github.com/maxrd2/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('09b95b408af45224c88529b09594349f')
 
 build() {
-  cd ${srcdir}/subtitlecomposer-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=/usr
-  # workaround for "gst/gstconfig.h: No such file or directory"
-  export CPATH=/usr/lib/gstreamer-1.0/include
   make
 }
 
 package() {
-  cd ${srcdir}/subtitlecomposer-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 } 
diff --git a/subtitlecomposer/default/subtitlecomposer.install b/subtitlecomposer/default/subtitlecomposer.install
new file mode 100644
index 00000000..2eaa6055
--- /dev/null
+++ b/subtitlecomposer/default/subtitlecomposer.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/subtitlecomposer/git/PKGBUILD b/subtitlecomposer/git/PKGBUILD
index 02c82f5f..a7ef0f21 100644
--- a/subtitlecomposer/git/PKGBUILD
+++ b/subtitlecomposer/git/PKGBUILD
@@ -1,5 +1,5 @@
-# Contributor: Mladen Milinkovic <maxrd2@smoothware.net>
 # Maintainer: Mladen Milinkovic <maxrd2@smoothware.net>
+# Contributor: Mladen Milinkovic <maxrd2@smoothware.net>
 
 # You can install/update Subtitle Composer from repository if you add following to /etc/pacman.conf
 # [subtitlecomposer]
@@ -7,38 +7,41 @@
 # SigLevel = PackageRequired
 # Server = http://smoothware.net/$repo/$arch
 
-pkgname=subtitlecomposer-git
-pkgver=v0.5.7.6.g2bde63e
+_name=subtitlecomposer
+pkgname=${_name}-git
+pkgver=v0.5.8
 pkgrel=1
-pkgdesc="A KDE subtitle editor - nightly build"
+pkgdesc="A KDE subtitle editor (git version)"
 arch=('i686' 'x86_64')
-url="https://github.com/maxrd2/subtitlecomposer"
+url="https://github.com/maxrd2/${_name}"
 license=('GPL')
-depends=('kdelibs' 'gettext')
-makedepends=('cmake' 'automoc4' 'git')
-conflicts=('subtitlecomposer')
-install=('subtitlecomposer.install')
-optdepends=('mpv: for MPV backend'
-            'mplayer: for MPlayer backend'
-            'mplayer2: for MPlayer backend'
-            'gstreamer: for GStreamer backend'
-            'xine-lib: for Xine backend')
-source=('git+file:///home/max/projects/SubtitleComposer')
+depends=('kcoreaddons' 'sonnet' 'kcodecs' 'kio' 'kross' 'kxmlgui' 'ki18n')
+# Comment/uncomment the following dependencies to disable/enable support for
+# MPV, gstreamer and/or Xine backend.
+# These are not optdepends as they must be present at build time.
+#depends+=('mpv')
+depends+=('gstreamer')
+depends+=('xine-lib')
+makedepends=('extra-cmake-modules' 'git')
+conflicts=(${_name})
+install=${_name}.install
+optdepends=('mplayer: for MPlayer backend')
+source=("git+https://github.com/maxrd2/${_name}.git")
 md5sums=('SKIP')
 
 pkgver() {
   export APP_VER=${pkgver}
-  cd ${srcdir}/SubtitleComposer
+  cd ${srcdir}/${_name}
   git describe --always | sed 's|-|.|g'
 }
 
 build() {
-  cd ${srcdir}/SubtitleComposer
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  cd ${srcdir}/${_name}
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/SubtitleComposer
+  cd ${srcdir}/${_name}
   make DESTDIR=${pkgdir} install
 }