diff --git a/SPECS/intel-cmt-cat.spec b/SPECS/intel-cmt-cat.spec
index daef847..2914e75 100644
--- a/SPECS/intel-cmt-cat.spec
+++ b/SPECS/intel-cmt-cat.spec
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2018, Intel Corporation
+# Copyright (c) 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 %global githubname   intel-cmt-cat
-%global githubver    2.0.0
+%global githubver    4.0.0
 
 %if %{defined githubsubver}
 %global githubfull   %{githubname}-%{githubver}.%{githubsubver}
@@ -38,10 +38,9 @@
 
 Summary:            Provides command line interface to CMT, MBM, CAT, CDP and MBA technologies
 Name:               %{githubname}
-Release:            3%{?dist}
+Release:            0%{?dist}
 Version:            %{githubver}
 License:            BSD
-Group:              Development/Tools
 ExclusiveArch:      x86_64 i686 i586
 %if %{defined githubsubver}
 Source:             https://github.com/01org/%{githubname}/archive/v%{githubver}.%{githubsubver}.tar.gz
@@ -50,9 +49,6 @@ Source:             https://github.com/01org/%{githubname}/archive/v%{githubver}
 %endif
 URL:                https://github.com/01org/%{githubname}
 BuildRequires:      gcc, make
-Patch1:             0001-make-Adding-LDFLAGS-to-the-libpqos-build-command.patch
-Patch2:             0002-make-Add-support-to-add-flags-to-LDFLAGS-via-EXTRA_L.patch
-
 
 %description
 This software package provides basic support for
@@ -72,7 +68,6 @@ it requires root privileges.
 Summary:            Library and sample code to use CMT, MBM, CAT, CDP and MBA technologies
 License:            BSD
 Requires:           intel-cmt-cat == %{version}
-Group:              Development/Tools
 ExclusiveArch:      x86_64 i686 i586
 
 %description -n intel-cmt-cat-devel
@@ -86,14 +81,12 @@ For additional information please refer to:
 https://github.com/01org/%{githubname}
 
 %prep
-%autosetup -n %{githubfull} -p1
-
-%post -p /sbin/ldconfig
+%autosetup -n %{githubfull}
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %build
-make %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}"
+make %{?_smp_mflags}
 
 %install
 # Not doing make install as it strips the symbols.
@@ -122,7 +115,7 @@ install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_licensedir}/%
 install -d %{buildroot}/%{_libdir}
 install -s %{_builddir}/%{githubfull}/lib/libpqos.so.* %{buildroot}/%{_libdir}
 cp -a %{_builddir}/%{githubfull}/lib/libpqos.so %{buildroot}/%{_libdir}
-cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.2 %{buildroot}/%{_libdir}
+cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.4 %{buildroot}/%{_libdir}
 
 # Install the header file
 install -d %{buildroot}/%{_includedir}
@@ -134,11 +127,13 @@ install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_usrsrc}/%{git
 
 install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c
 
-install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT
-install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/Makefile          %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT
-install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/reset_app.c       %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT
-install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/allocation_app.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT
-install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/association_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT
+install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/Makefile          %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/reset_app.c       %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_l2cat.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_l3cat.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_mba.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/association_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
 
 install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM
 install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/Makefile      %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM
@@ -161,17 +156,22 @@ install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/monitor_app.c %{bu
 
 %files -n intel-cmt-cat-devel
 %{_libdir}/libpqos.so
-%{_libdir}/libpqos.so.2
+%{_libdir}/libpqos.so.4
 %{_includedir}/pqos.h
-%{_usrsrc}/%{githubfull}/c/CAT/Makefile
-%{_usrsrc}/%{githubfull}/c/CAT/reset_app.c
-%{_usrsrc}/%{githubfull}/c/CAT/association_app.c
-%{_usrsrc}/%{githubfull}/c/CAT/allocation_app.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/Makefile
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/reset_app.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/association_app.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_l2cat.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_l3cat.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_mba.c
 %{_usrsrc}/%{githubfull}/c/CMT_MBM/Makefile
 %{_usrsrc}/%{githubfull}/c/CMT_MBM/monitor_app.c
 %doc %{_usrsrc}/%{githubfull}/LICENSE
 
 %changelog
+* Mon Oct 12 2020 Jiri Olsa <jolsa@redhat.com> - 4.0.0-0
+- New release 4.0.0
+
 * Thu Jun 11 2020 Martin Cermak <mcermak@redhat.com> - 2.0.0-3
 - NVR bump and rebuild because of CI gating.
   Related: #1682388