diff --git a/.gitignore b/.gitignore
index f45ad21..c1f6516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ sos-2.2.tar.gz
 /3.7.tar.gz
 /3.8.tar.gz
 /3.9.1.tar.gz
+/4.0.tar.gz
diff --git a/sos.spec b/sos.spec
index ffc3aff..7b8428b 100644
--- a/sos.spec
+++ b/sos.spec
@@ -1,20 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 3.9.1
-Release: 3%{?dist}
+Version: 4.0
+Release: 1%{?dist}
 Source0: https://github.com/sosreport/sos/archive/%{version}.tar.gz
 License: GPLv2+
 BuildArch: noarch
 Url: https://github.com/sosreport/sos
 BuildRequires: python3-devel
 BuildRequires: gettext
-BuildRequires: python3-six
 Requires: libxml2-python3
+Requires: python3-rpm
+Requires: tar
 Requires: bzip2
 Requires: xz
-Requires: python3-six
-Conflicts: vdsm <= 4.30.17
+Requires: python3-pexpect
+Obsoletes: sos-collector <= 1.9
 
 %description
 Sos is a set of tools that gathers information about system
@@ -31,20 +33,34 @@ support technicians and developers.
 %install
 %py3_install '--install-scripts=%{_sbindir}'
 
-install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d
+install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
 %find_lang %{name} || echo 0
 
 %files -f %{name}.lang
+%{_sbindir}/sos
 %{_sbindir}/sosreport
+%{_sbindir}/sos-collector
+%dir /etc/sos/cleaner
+%dir /etc/sos/presets.d
+%dir /etc/sos/extras.d
+%dir /etc/sos/groups.d
 %{python3_sitelib}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %doc AUTHORS README.md
 %license LICENSE
-%config(noreplace) %{_sysconfdir}/sos.conf
+%config(noreplace) %{_sysconfdir}/sos/sos.conf
 
 %changelog
+* Mon Sep 14 2020 Sandro Bonazzola <sbonazzo@redhat.com> - 4.0-1
+- Update to 4.0 (#1869464)
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index c2edf56..2f4cdbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (3.9.1.tar.gz) = 9088627ef4a473ee45215d52af473023ff47a347ebad10cc5b7b546bdef6452719914541055a6cd70843a4f8fd7163b0e1f14c0881964d7ddeb27e195c1aba61
+SHA512 (4.0.tar.gz) = a98a6b4309c982fea73df9c1f7bafec13eb3a40dc7ef613332bb753520850c1e23514efcf61cf3ca144a467abc1b720fae8c2791a972894520bf1b5a72b6774b