diff --git a/.gitignore b/.gitignore
index 13dce04..d503e30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libebml-1.0.0.tar.bz2
 /libebml-1.3.3.tar.bz2
 /libebml-1.3.4.tar.bz2
 /libebml-1.3.5.tar.xz
+/libebml-1.3.6.tar.xz
diff --git a/libebml.spec b/libebml.spec
index ddef259..ab7d189 100644
--- a/libebml.spec
+++ b/libebml.spec
@@ -1,11 +1,13 @@
 Summary:    Extensible Binary Meta Language library
 Name:       libebml
-Version:    1.3.5
-Release:    2%{?dist}
+Version:    1.3.6
+Release:    1%{?dist}
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        https://www.matroska.org/
 Source:     https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz
+BuildRequires: cmake
+BuildRequires: gcc-c++
 
 %description
 Extensible Binary Meta Language access library A library for reading
@@ -17,6 +19,8 @@ pendant to XML.
 Summary:    Development files for the Extensible Binary Meta Language library
 Group:      Development/Libraries
 Requires:   %{name}%{?_isa} = %{version}-%{release}
+Requires:   cmake-filesystem
+Requires:   pkgconfig
 
 %description devel
 Extensible Binary Meta Language access library A library for reading
@@ -32,31 +36,40 @@ will use the Extensible Binary Meta Language library.
 
 
 %build
-%configure --disable-static
+%cmake
 make %{?_smp_mflags}
 
 
 %install
 %make_install
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
-%doc ChangeLog LICENSE.LGPL
+%license LICENSE.LGPL
+%doc ChangeLog
 %{_libdir}/%{name}.so.*
 
 %files devel
 %{_includedir}/ebml/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/cmake/ebml/EbmlConfig.cmake
+%{_libdir}/cmake/ebml/EbmlConfigVersion.cmake
+%{_libdir}/cmake/ebml/EbmlTargets-noconfig.cmake
+%{_libdir}/cmake/ebml/EbmlTargets.cmake
 
 
 %changelog
+* Mon Jul 23 2018 Dominik Mierzejewski <rpm@greysector.net> - 1.3.6-1
+- update to 1.3.6 (#1570224)
+- add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
+- switch build system to cmake
+- add missing dependencies to -devel subpackage
+- use license and ldconfig_scriptlets macros
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 90a9469..a9eb27c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libebml-1.3.5.tar.xz) = cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
+SHA512 (libebml-1.3.6.tar.xz) = 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f