diff --git a/protobuf-c.changes b/protobuf-c.changes
index a074211..df6da9a 100644
--- a/protobuf-c.changes
+++ b/protobuf-c.changes
@@ -6,6 +6,15 @@ Mon Jul 11 07:46:47 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
   * Avoid shifting signed values (GH#508)
 - Remove 508.patch (merged)
 
+-------------------------------------------------------------------
+Tue Jul  5 12:38:17 UTC 2022 - Adam Majer <adam.majer@suse.de>
+
+- Do not build static libraries
+- Run unit tests
+- Explicit files and directories for includedir, so we can detect
+  what we actually install there
+- 508.patch: fixes invalid arithmetic shift (bsc#1200908, CVE-2022-33070)
+
 -------------------------------------------------------------------
 Tue Nov 23 10:10:53 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/protobuf-c.spec b/protobuf-c.spec
index a74b260..40d703e 100644
--- a/protobuf-c.spec
+++ b/protobuf-c.spec
@@ -54,7 +54,7 @@ Summary:        C bindings for Google's Protocol Buffers
 Group:          Development/Libraries/C and C++
 Requires:       libprotobuf-c%sover = %version
 Provides:       %name = %version
-Obsoletes:      %name <= %version
+Obsoletes:      %name <= 1.4.0
 
 %description -n libprotobuf-c-devel
 This package provides a code generator and runtime libraries to use Protocol
@@ -64,14 +64,20 @@ Buffers from pure C (not C++).
 %autosetup -p1
 
 %build
+%{!?make_build:%define make_build make -O %{?_smp_mflags} V=1 VERBOSE=1}
 %define _lto_cflags %nil
 autoreconf -fvi
-%configure
+%configure \
+    --enable-static=no
+
 %make_build
 
 %install
 %make_install
-rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
+rm %buildroot/%_libdir/*.la
+
+%check
+make check
 
 %post   -n libprotobuf-c%sover -p /sbin/ldconfig
 %postun -n libprotobuf-c%sover -p /sbin/ldconfig
@@ -83,9 +89,13 @@ rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
 
 %files -n libprotobuf-c-devel
 %doc ChangeLog TODO
+%dir %_includedir/protobuf-c
+%dir %_includedir/google
+%dir %_includedir/google/protobuf-c
+%_includedir/protobuf-c/*
+%_includedir/google/protobuf-c/protobuf-c.h
 %_bindir/protoc-c
 %_bindir/protoc-gen-c
-%_includedir/*/
 %_libdir/libprotobuf-c.so
 %_libdir/pkgconfig/libprotobuf-c.pc