diff --git a/qt5-fsarchiver-terminal/PKGBUILD b/qt5-fsarchiver-terminal/PKGBUILD
new file mode 100644
index 000000000..b0dab9cd7
--- /dev/null
+++ b/qt5-fsarchiver-terminal/PKGBUILD
@@ -0,0 +1,27 @@
+pkgname=qt5-fsarchiver-terminal
+_pkgname=qt-fsarchiver-terminal
+pkgver=0.8.5.2
+_pkgver=${pkgver:0:5}-${pkgver:6}
+pkgrel=1
+pkgdesc='Terminal app for qt5-fsarchiver.'
+arch=('x86_64')
+url='http://sourceforge.net/projects/qt-fsarchiver/'
+license=('GPL')
+depends=('fsarchiver' 'qt5-base')
+makedepends=('qt5-tools')
+categories=('utils')
+provides=('qt-fsarchiver-terminal')
+source=("http://sourceforge.net/projects/qt-fsarchiver/files/source/${_pkgname}/${_pkgname}-${_pkgver}.tar.gz")
+sha256sums=('745a12b5fbbf196a7493d7b831604b7e5f0886d54ab4a51809115809a447eeb2')
+
+build() {
+    cd ${_pkgname}
+    qmake-qt5
+    make
+}
+
+package() {
+  cd ${_pkgname}
+  make INSTALL_ROOT="${pkgdir}" install
+  	
+}
diff --git a/qt5-fsarchiver-terminal/qt5-fsarchiver.desktop b/qt5-fsarchiver-terminal/qt5-fsarchiver.desktop
new file mode 100644
index 000000000..75ba8a2c0
--- /dev/null
+++ b/qt5-fsarchiver-terminal/qt5-fsarchiver.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=qt5-fsarchiver
+Name[de_DE]=qt5-fsarchiver
+Comment=Qt GUI for fsarchiver
+Exec=kdesu qt5-fsarchiver
+Icon=qt5-fsarchiver
+Terminal=false
+Type=Application
+Categories=Utility;
+StartupNotify=false
+
diff --git a/qt5-fsarchiver-terminal/qt5-fsarchiver.png b/qt5-fsarchiver-terminal/qt5-fsarchiver.png
new file mode 100644
index 000000000..ebab7a5a5
Binary files /dev/null and b/qt5-fsarchiver-terminal/qt5-fsarchiver.png differ
diff --git a/qt5-fsarchiver/PKGBUILD b/qt5-fsarchiver/PKGBUILD
index 9352f40b0..e296c2ae8 100644
--- a/qt5-fsarchiver/PKGBUILD
+++ b/qt5-fsarchiver/PKGBUILD
@@ -1,49 +1,32 @@
 pkgname=qt5-fsarchiver
-pkgver=0.8.1.1
+_pkgname=qt-fsarchiver
+pkgver=0.8.5.4
 _pkgver=${pkgver:0:5}-${pkgver:6}
 pkgrel=1
 pkgdesc='GUI for fsarchiver'
 arch=('x86_64')
-url='http://sourceforge.net/projects/qt4-fsarchiver/'
+url='http://sourceforge.net/projects/qt-fsarchiver/'
 license=('GPL')
-depends=('fsarchiver' 'kdesu' 'qt5-base')
+depends=('fsarchiver' 'qt5-base' 'qt5-fsarchiver-terminal')
 makedepends=('qt5-tools')
 categories=('utils')
-replaces=('qt4-fsarchiver')
+provides=('qt-fsarchiver')
 screenshot=('http://media.cdn.ubuntu-de.org/wiki/attachments/02/04/verzeichnis.jpg')
-source=("http://sourceforge.net/projects/qt4-fsarchiver/files/${pkgname}/source/${pkgname}-${_pkgver}.tar.gz"
-	"${pkgname}.png"
-	"${pkgname}.desktop")
-install="${pkgname}.install"
-sha256sums=('e074e2bc186dd8d7f30a6de8adf5990f2acffd8d8c0a508270344d46d90128eb'
-            'bf7ba38cd47b670955334dd716be7efb4257a2beca3f3438ed63c828d4116ed1'
-            'b8bedb9a51ff8764e0efb535bbf5a0e80f264166b56662e72ab5fb9005a5e8d5')
+source=("http://sourceforge.net/projects/$_pkgname/files/source/${_pkgname}/${_pkgname}-${_pkgver}.tar.gz")
+sha256sums=('5250cef93f70283a8c02f63dbf622fbbc9c81afe83584b2081d8d4e7a10e171e')
 
 build() {
-    cd "${srcdir}/${pkgname}"
+    cd ${_pkgname}
     qmake-qt5
     make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd ${_pkgname}
   make INSTALL_ROOT="${pkgdir}" install
   
-#  install -d ${pkgdir}/usr/share/pixmaps
-#  install -d ${pkgdir}/usr/share/qt/translations
-#  rm -R ${pkgdir}/usr/share/qt4
-#  rm -R ${pkgdir}/usr/share/app-install
-#  install -D -m644 ${srcdir}/${pkgname}/translations/*.qm ${pkgdir}/usr/share/qt/translations
-  
-  # install icon
-  install -D ${srcdir}/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-  # .desktop file
-  install -D ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  rm ${pkgdir}/usr/share/applications/mate-qt5-fsarchiver.desktop
-  rm ${pkgdir}/usr/share/applications/gnome-qt5-fsarchiver.desktop
-  rm ${pkgdir}/usr/share/applications/kde-qt5-fsarchiver.desktop
-  
-  # remove unused files
-  rm -r ${pkgdir}/usr/share/app-install
-	
+  ln -s $pkgdir/usr/sbin/qt-fsarchiver $pkgdir/usr/sbin/qt5-fsarchiver
+
+  # Fix package name in .desktop file
+  sed -i s/qt-fsarchiver/qt5-fsarchiver/g $pkgdir/usr/share/applications/$_pkgname.desktop
 }
diff --git a/qt5-fsarchiver/qt5-fsarchiver.install b/qt5-fsarchiver/qt5-fsarchiver.install
deleted file mode 100644
index e70c054ec..000000000
--- a/qt5-fsarchiver/qt5-fsarchiver.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}