diff --git a/common/shlibs b/common/shlibs
index 98b28735c4..865ebcbe79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3153,11 +3153,11 @@ libGammu.so.8 gammu-1.39.0_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-27_2
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
-libembb_mtapi_cpp.so embb-devel-1.0.0_1
-libembb_mtapi_c.so embb-devel-1.0.0_1
-libembb_mtapi_network_c.so embb-devel-1.0.0_1
-libembb_base_cpp.so embb-devel-1.0.0_1
-libembb_base_c.so embb-devel-1.0.0_1
+libembb_mtapi_cpp.so embb-1.0.0_3
+libembb_mtapi_c.so embb-1.0.0_3
+libembb_mtapi_network_c.so embb-1.0.0_3
+libembb_base_cpp.so embb-1.0.0_3
+libembb_base_c.so embb-1.0.0_3
 libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template
index 0906831c53..d6a239cc33 100644
--- a/srcpkgs/embb/template
+++ b/srcpkgs/embb/template
@@ -1,9 +1,10 @@
 # Template file for 'embb'
 pkgname=embb
 version=1.0.0
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
+configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
 short_desc="Library for parallel programming of embedded systems"
 maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
@@ -13,6 +14,8 @@ checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8
 
 post_install() {
 	vlicense COPYING.md
+	vmkdir usr/lib/cmake
+	mv ${DESTDIR}/usr/CMake/* ${DESTDIR}/usr/lib/cmake
 }
 
 embb-devel_package() {
@@ -20,8 +23,8 @@ embb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.a"
 	}
 }