diff --git a/qtkeychain-qt4/PKGBUILD b/qtkeychain-qt4/PKGBUILD
new file mode 100644
index 000000000..b10f0ce91
--- /dev/null
+++ b/qtkeychain-qt4/PKGBUILD
@@ -0,0 +1,31 @@
+pkgname=qtkeychain-qt4
+pkgver=0.8.0
+pkgrel=3
+pkgdesc="Provides support for secure credentials storage. (Qt4 version)"
+arch=('x86_64')
+url="https://github.com/frankosterfeld/qtkeychain"
+license=('BSD')
+depends=('qt')
+makedepends=('cmake' 'icu')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/frankosterfeld/${pkgname//\-qt4/}/archive/v${pkgver}.tar.gz")
+sha1sums=('d6ff0726245ee24e249e76ee9025b473239dd637')
+
+prepare() {
+    mkdir -p build
+}
+
+build() {
+    cd build
+    cmake ../${pkgname//\-qt4/}-$pkgver \
+          -DBUILD_WITH_QT4=ON \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          -DCMAKE_BUILD_TYPE=Release
+    make
+}
+
+package() {
+    cd build
+    make DESTDIR="$pkgdir" install
+    install -Dm644 "$srcdir"/qtkeychain-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/qtkeychain/PKGBUILD b/qtkeychain/PKGBUILD
index dc973046c..e641de14a 100644
--- a/qtkeychain/PKGBUILD
+++ b/qtkeychain/PKGBUILD
@@ -1,52 +1,34 @@
-pkgbase=qtkeychain
-pkgname=('qtkeychain-qt4' 'qtkeychain-qt5')
+pkgname=qtkeychain
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="Provides support for secure credentials storage."
 arch=('x86_64')
 url="https://github.com/frankosterfeld/qtkeychain"
 license=('BSD')
-makedepends=('cmake' 'icu' 'qt5-tools' 'qt')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/frankosterfeld/$pkgbase/archive/v${pkgver}.tar.gz")
+depends=('qt5-base')
+makedepends=('cmake' 'icu' 'qt5-tools' 'extra-cmake-modules')
+provides=("$pkgname-qt"{4,5})
+replaces=("$pkgname-qt"{4,5})
+source=("$pkgname-$pkgver.tar.gz::https://github.com/frankosterfeld/$pkgname/archive/v${pkgver}.tar.gz")
 sha1sums=('d6ff0726245ee24e249e76ee9025b473239dd637')
 
 prepare() {
-    mkdir -p build{4,5}
+    mkdir -p build
 }
 
 build() {
-    cd build4
-    cmake ../$pkgbase-$pkgver \
-          -DBUILD_WITH_QT4=ON \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_INSTALL_LIBDIR=lib \
-          -DCMAKE_INSTALL_LIBEXECDIR=lib/qtkeychain-qt4 \
-          -DCMAKE_BUILD_TYPE=Release
-    make
-    
-    cd ../build5
+    cd $srcdir/build
     cmake ../$pkgbase-$pkgver \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_INSTALL_LIBDIR=lib \
-          -DCMAKE_INSTALL_LIBEXECDIR=lib/qtkeychain-qt5 \
-          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_INSTALL_LIBEXECDIR=lib/${pkgname} \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DLIBSECRET_SUPPORT=OFF
     make
 }
 
-package_qtkeychain-qt4() {
-    depends=('qt')
-    provides=('qtkeychain')
-    replaces=('qtkeychain')
-
-    cd build4
+package() {
+    cd $srcdir/build
     make DESTDIR="$pkgdir" install
-    install -Dm644 "$srcdir"/$pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_qtkeychain-qt5() {
-    depends=('qt5-base')
-
-    cd build5
-    make DESTDIR="$pkgdir" install
-    install -Dm644 "$srcdir"/$pkgbase-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+    install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }