diff --git a/AppStream.spec b/AppStream.spec
index 8662490..86ea88d 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -43,6 +43,14 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AppStream-Core makes it easy to access application information from the
 AppStream database over a nice GObject-based interface.
 
+%package -n libappstream1
+Summary:        The main library for AppStream
+Group:          System/Libraries
+Requires:       %{name} = %{version}
+
+%description -n libappstream1
+The main library for AppStream.
+
 %package -n libAppstreamQt1
 Summary:        Qt5 bindings for AppStream
 Group:          System/Libraries
@@ -54,6 +62,7 @@ The Qt5 bindings for AppStream.
 Summary:        Needed include files and libraries for development
 Group:          Development/Libraries/C and C++
 Requires:       libAppstreamQt1 = %{version}
+Requires:       libappstream1 = %{version}
 
 %description -n libAppstreamQt-devel
 This package contains all necessary include files, libraries,
@@ -71,12 +80,12 @@ This package contains all necessary include files, libraries,
 configuration files and development tools (with manual pages) needed to
 compile and link applications using AppStream.
 
-%package -n typelib-1_0-Appstream-1.0
+%package -n typelib-1_0-AppStream-1.0
 Summary:        Simple software installation management software -- Introspection bindings
 License:        LGPL-2.1+
 Group:          System/Libraries
 
-%description -n typelib-1_0-Appstream-1.0
+%description -n typelib-1_0-AppStream-1.0
 PackageKit is a system designed to make installing and updating
 software on your computer easier.  The primary design goal is to unify
 all the software graphical tools used in different distributions, and
@@ -84,6 +93,7 @@ use some of the latest technology like PolicyKit to make the process
 suck less.
 
 %lang_package
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -93,19 +103,15 @@ SUFFIX="64"
 %else
 SUFFIX=""
 %endif
-mkdir -p build
-cd build
-cmake \
-      -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-      -DQT=ON \
-      -DLIB_SUFFIX=$SUFFIX \
-      -DINSTALL_PREBUILT_DOCS=OFF \
+
+%cmake -d build -- -DQT=ON \
+       -DINSTALL_PREBUILT_DOCS=OFF \
       -DDOCUMENTATION=OFF \
-      -DAPPSTREAM_QT_VERSION=5 ..
+      -DAPPSTREAM_QT_VERSION=5
 make %{?_smp_mflags}
 
 %install
-%cmake_install
+%cmake_install -C build
 
 %find_lang appstream %{name}.lang
 
@@ -121,12 +127,15 @@ make %{?_smp_mflags}
 %defattr(-,root,root)
 %doc LICENSE* NEWS
 %{_bindir}/appstreamcli
-%{_libdir}/libappstream.so.*
 %config(noreplace) %{_sysconfdir}/appstream.conf
 %dir %{_datadir}/app-info
 %{_datadir}/app-info/categories.xml
 %{_mandir}/man1/appstreamcli.*
-%{_datadir}/gettext/
+
+%files -n libappstream1
+%defattr(-,root,root)
+%doc LICENSE* NEWS
+%{_libdir}/libappstream.so.*
 
 %files -n libAppstreamQt1
 %defattr(-,root,root)
@@ -145,8 +154,9 @@ make %{?_smp_mflags}
 %{_libdir}/pkgconfig/appstream.pc
 %{_includedir}/AppStream/
 %{_datadir}/gir-1.0/AppStream-1.0.gir
+%{_datadir}/gettext/
 
-%files -n typelib-1_0-Appstream-1.0
+%files -n typelib-1_0-AppStream-1.0
 %defattr(-,root,root)
 %doc LICENSE*
 %{_libdir}/girepository-1.0/AppStream-1.0.typelib