diff --git a/.gitignore b/.gitignore
index 5da38d3..1b60dac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /oscap-anaconda-addon-0.6.tar.gz
 /oscap-anaconda-addon-0.7.tar.gz
 /oscap-anaconda-addon-1.0.tar.gz
+/oscap-anaconda-addon-2.0.0.tar.gz
+/addon-dbus-data.zip
diff --git a/oscap-anaconda-addon.spec b/oscap-anaconda-addon.spec
index b446ff7..08aab42 100644
--- a/oscap-anaconda-addon.spec
+++ b/oscap-anaconda-addon.spec
@@ -9,14 +9,16 @@
 %endif
 
 Name:           oscap-anaconda-addon
-Version:        1.0
-Release:        11%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Anaconda addon integrating OpenSCAP to the installation process
 
 License:        GPLv2+
 URL:            https://github.com/OpenSCAP/oscap-anaconda-addon
 
 Source0:        https://github.com/OpenSCAP/oscap-anaconda-addon/releases/download/r%{version}/%{name}-%{version}.tar.gz
+# TODO: Remove when the fixed upstream release contains dbus service data
+Source1:        addon-dbus-data.zip
 
 BuildArch:      noarch
 BuildRequires:  make
@@ -26,7 +28,6 @@ BuildRequires:  python3-pycurl
 BuildRequires:  openscap openscap-utils openscap-python3
 BuildRequires:  anaconda-core >= %{anaconda_core_version}
 Requires:       anaconda-core >= %{anaconda_core_version}
-Requires:       python3-cpio
 Requires:       python3-pycurl
 Requires:       python3-kickstart
 Requires:       openscap openscap-utils openscap-python3
@@ -39,7 +40,7 @@ content.
 
 %prep
 %autosetup
-
+unzip %{_sourcedir}/addon-dbus-data.zip
 
 %build
 
@@ -51,10 +52,16 @@ make install DESTDIR=%{buildroot}
 
 %files -f %{name}.lang
 %{_datadir}/anaconda/addons/org_fedora_oscap
+%{_datadir}/anaconda/dbus/confs/org.fedoraproject.Anaconda.Addons.OSCAP.conf
+%{_datadir}/anaconda/dbus/services/org.fedoraproject.Anaconda.Addons.OSCAP.service
 
 %doc COPYING ChangeLog README.md
 
 %changelog
+* Fri Jul 02 2021 Matej Tyc <matyc@redhat.com> - 2.0.0-1
+- Rebase to the 2.0.0 upstream release.
+- Remove the cpio dependency which is not needed any more.
+
 * Wed Jun 23 2021 Jan Černý <jcerny@redhat.com> - 1.0-11
 - Rebuild after test config change in test.yml
 
diff --git a/sources b/sources
index 2282c78..728813e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (oscap-anaconda-addon-1.0.tar.gz) = fe6de7857eedeb81e400b9e06c5c8ee245906ddde8420ebe498da7ed1a6587075941bcb5f65c6bbf5cef0a6baecc6466ee102eeab76a1ef79db49c28d6a22de7
+SHA512 (oscap-anaconda-addon-2.0.0.tar.gz) = 39d8692e8904cfd6e0b2b00e5081805977f4510154315be22732b8b31a42e65ed8a11dc2711f5ad5d4964bb1728521ce472ac208852f6a2373be45903a8d5611
+SHA512 (addon-dbus-data.zip) = 2a618f6084f4dd5571d5c2aa22f7c7316e0e2de8a61c8eb13a9127f8726655e3d173d71c74ee7aa305d046a70f030ed07be8405debeb5fd0e8b6a40f081acf71