diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..d8e03b8
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,4 @@
+libbrotlicommon1
+libbrotlidec1
+libbrotlienc1
+
diff --git a/brotli.changes b/brotli.changes
index a895660..be55a08 100644
--- a/brotli.changes
+++ b/brotli.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul 25 13:14:15 UTC 2018 - bjorn.lie@gmail.com
+
+- Add baselibs.conf, build 32bit library support.
+
+-------------------------------------------------------------------
+Tue Jul 24 07:55:04 UTC 2018 - mpluskal@suse.com
+
+- Use cmake macros for building and tests
+
 -------------------------------------------------------------------
 Thu Jun 28 11:04:51 UTC 2018 - mpluskal@suse.com
 
diff --git a/brotli.spec b/brotli.spec
index 84940aa..fb7560d 100644
--- a/brotli.spec
+++ b/brotli.spec
@@ -27,6 +27,7 @@ License:        MIT
 Group:          Productivity/Archiving/Compression
 Url:            https://github.com/google/brotli
 Source0:        https://github.com/google/brotli/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source99:       baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake >= 2.8.6
 BuildRequires:  gcc-c++
@@ -94,7 +95,7 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.
        -DCMAKE_INSTALL_LIBDIR:PATH="%{_libdir}" \
        -DBROTLI_DISABLE_TESTS:BOOL=off \
        -DCMAKE_SKIP_RPATH:BOOL=off
-make %{?_smp_mflags}
+%make_jobs
 
 %install
 %cmake_install
@@ -111,8 +112,7 @@ done
 %endif
 
 %check
-cd build
-make test
+%ctest
 
 %post -n libbrotlicommon%{sover} -p /sbin/ldconfig
 %postun -n libbrotlicommon%{sover} -p /sbin/ldconfig