diff --git a/qtkeychain.spec b/qtkeychain.spec
index 58b40ba..e22afe5 100644
--- a/qtkeychain.spec
+++ b/qtkeychain.spec
@@ -2,67 +2,68 @@
 
 Name:           qtkeychain
 Version:        0.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A password store library
 
 License:        BSD
 Url:            https://github.com/frankosterfeld/qtkeychain
-Source0:        https://github.com/frankosterfeld/qtkeychain/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
+BuildRequires:  gcc-c++
 BuildRequires:  cmake
+
+BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(QtDBus)
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  qt5-linguist
 
 %description
 The qtkeychain library allows you to store passwords easy and secure.
 
 %package devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
 %description devel
 This package contains development files for qtkeychain.
 
 %package qt5
-Summary:        A password store library
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Summary:        %{summary}
+
 %description qt5
 The qt5keychain library allows you to store passwords easy and secure.
 
 %package qt5-devel
 Summary:        Development files for %{name}-qt5
-Requires:       %{name}-qt5%{?_isa} = %{version}-%{release}
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5LinguistTools)
+Requires:       %{name}-qt5%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       qt5-qtbase-devel%{?_isa}
+
 %description qt5-devel
 This package contains development files for qt5keychain.
 
-
 %prep
-%setup -q
+%autosetup
+mkdir %{_target_platform}-qt4
+mkdir %{_target_platform}-qt5
 
 %build
-mkdir build
-pushd build
-%cmake .. \
+pushd %{_target_platform}-qt4
+  %cmake .. \
     -DBUILD_WITH_QT4:BOOL=ON \
-    -DCMAKE_BUILD_TYPE=Release
-
-make %{?_smp_mflags}
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo
 popd
-
-mkdir build-qt5
-pushd build-qt5
-%cmake .. \
+pushd %{_target_platform}-qt5
+  %cmake .. \
     -DBUILD_WITH_QT4:BOOL=OFF \
-    -DCMAKE_BUILD_TYPE=Release
-
-make %{?_smp_mflags}
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo
 popd
 
+%make_build -C %{_target_platform}-qt4
+%make_build -C %{_target_platform}-qt5
 
 %install
-make install DESTDIR=%{buildroot} -C build-qt5
-make install DESTDIR=%{buildroot} -C build
+%make_install -C %{_target_platform}-qt4
+%make_install -C %{_target_platform}-qt5
 
 %find_lang %{name} --with-qt
 
@@ -76,12 +77,12 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang
 %files -f %{name}-qt4.lang
 %doc ReadMe.txt
 %license COPYING
-%{_libdir}/libqtkeychain.so.0*
+%{_libdir}/libqtkeychain.so.*
 
 %files devel
 %{_includedir}/qtkeychain/
 %{_libdir}/cmake/QtKeychain/
-%{_libdir}/libqtkeychain.so*
+%{_libdir}/libqtkeychain.so
 
 %post qt5 -p /sbin/ldconfig
 %postun qt5 -p /sbin/ldconfig
@@ -89,15 +90,17 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang
 %files qt5 -f %{name}-qt5.lang
 %doc ReadMe.txt
 %license COPYING
-%{_libdir}/libqt5keychain.so*
+%{_libdir}/libqt5keychain.so.*
 
 %files qt5-devel
 %{_includedir}/qt5keychain/
 %{_libdir}/cmake/Qt5Keychain/
 %{_libdir}/libqt5keychain.so
 
-
 %changelog
+* Sat Jul 23 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.7.0-2
+- Fix packaging problems
+
 * Mon May 23 2016 nikos roussos <comzeradd@fedoraproject.org> 0.7.0-1
 - update to 0.7.0