diff --git a/.gitignore b/.gitignore
index 91990b3..b1f4710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ gnome-backgrounds-2.30.0.tar.bz2
 /gnome-backgrounds-3.37.92.tar.xz
 /gnome-backgrounds-3.37.92.1.tar.xz
 /gnome-backgrounds-3.38.0.tar.xz
+/gnome-backgrounds-40.rc.tar.xz
diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec
index 9f9564b..4e5a9b6 100644
--- a/gnome-backgrounds.spec
+++ b/gnome-backgrounds.spec
@@ -1,19 +1,17 @@
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name: gnome-backgrounds
-Version: 3.38.0
-Release: 2%{?dist}
+Version: 40~rc
+Release: 1%{?dist}
 Summary: Desktop backgrounds packaged with the GNOME desktop
 
 License: GPLv2
 URL: http://www.gnome.org
-Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
-
-Patch0: move-adwaita-backgrounds.patch
+Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
 
 BuildArch: noarch
 BuildRequires: gettext
 BuildRequires: meson
-# Make sure both gnome-backgrounds and -extras get installed on upgrades
-Obsoletes: gnome-backgrounds < 3.24.0-3
 
 %description
 The gnome-backgrounds package contains the default
@@ -22,17 +20,14 @@ for the GNOME Desktop version
 
 %package        extras
 Summary:        Additional GNOME Backgrounds
-License:        GPLv2
-# Make sure both gnome-backgrounds and -extras get installed on upgrades
-Obsoletes:      gnome-backgrounds < 3.24.0-3
+Requires:       %{name} = %{version}-%{release}
 
 %description    extras
 This package contains the additional desktop backgrounds
 which are packaged with the GNOME desktop.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
 %meson
@@ -50,30 +45,32 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %license COPYING
 %doc AUTHORS NEWS README.md
 %{_datadir}/gnome-background-properties/adwaita.xml
-%{_datadir}/backgrounds/gnome/adwaita-day.jpg
-%{_datadir}/backgrounds/gnome/adwaita-morning.jpg
-%{_datadir}/backgrounds/gnome/adwaita-night.jpg
+%{_datadir}/backgrounds/gnome/adwaita-day.png
+%{_datadir}/backgrounds/gnome/adwaita-morning.png
+%{_datadir}/backgrounds/gnome/adwaita-night.png
 %{_datadir}/backgrounds/gnome/adwaita-timed.xml
 
 %files extras
-%license COPYING
-%doc AUTHORS NEWS README.md
 %{_datadir}/gnome-background-properties/gnome-backgrounds.xml
-%{_datadir}/backgrounds/gnome/Acrylic.jpg
 %{_datadir}/backgrounds/gnome/ColdWarm.jpg
-%{_datadir}/backgrounds/gnome/Dark_Ivy.jpg
-%{_datadir}/backgrounds/gnome/Endless-shapes.jpg
-%{_datadir}/backgrounds/gnome/Icetwigs.jpg
-%{_datadir}/backgrounds/gnome/LightWaves.jpg
-%{_datadir}/backgrounds/gnome/Road.jpg
-%{_datadir}/backgrounds/gnome/SeaSunset.jpg
-%{_datadir}/backgrounds/gnome/Stripes.jpg
-%{_datadir}/backgrounds/gnome/Symbolics-1.jpg
-%{_datadir}/backgrounds/gnome/Symbolics-2.jpg
+%{_datadir}/backgrounds/gnome/DepthLava.png
+%{_datadir}/backgrounds/gnome/IceCrystals.jpg
+%{_datadir}/backgrounds/gnome/Lava.jpg
+%{_datadir}/backgrounds/gnome/Leaf.jpg
+%{_datadir}/backgrounds/gnome/LightBulb.jpg
+%{_datadir}/backgrounds/gnome/Loveles.jpg
+%{_datadir}/backgrounds/gnome/Symbolics-1.png
+%{_datadir}/backgrounds/gnome/Tree.jpg
 %{_datadir}/backgrounds/gnome/VNC.png
 %{_datadir}/backgrounds/gnome/Wood.jpg
 
 %changelog
+* Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
+- Update to 40.rc
+- Make -extras subpackage require the main package
+- Drop move-adwaita-backgrounds.patch
+- Remove old obsoletes
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/move-adwaita-backgrounds.patch b/move-adwaita-backgrounds.patch
deleted file mode 100644
index 12c0342..0000000
--- a/move-adwaita-backgrounds.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up gnome-backgrounds-3.38.0/backgrounds/gnome-backgrounds.xml.in.kala gnome-backgrounds-3.38.0/backgrounds/gnome-backgrounds.xml.in
---- gnome-backgrounds-3.38.0/backgrounds/gnome-backgrounds.xml.in.kala	2020-09-14 12:29:02.781761000 +0200
-+++ gnome-backgrounds-3.38.0/backgrounds/gnome-backgrounds.xml.in	2020-09-14 13:00:09.544391986 +0200
-@@ -44,13 +44,6 @@
-     <scolor>#000000</scolor>
- 	</wallpaper>
- 	<wallpaper deleted="false">
--		<name>Adwaita</name>
--		<filename>@BACKGROUNDDIR@/adwaita-timed.xml</filename>
--		<options>zoom</options>
--    <pcolor>#ffffff</pcolor>
--    <scolor>#000000</scolor>
--	</wallpaper>
--	<wallpaper deleted="false">
- 		<name>Sea Sunset</name>
- 		<filename>@BACKGROUNDDIR@/SeaSunset.jpg</filename>
- 		<options>zoom</options>
diff --git a/sources b/sources
index f3cf094..61db30e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-backgrounds-3.38.0.tar.xz) = 01000409d6d54af81e520b8b292c24bb64e763a493c69cf71cabb9f885c7feee5a1805db40e2d0544834c40b7866f889c106e9816fd8e8b8f5273b0a099f1488
+SHA512 (gnome-backgrounds-40.rc.tar.xz) = 69e55da046d3289109c4bbddfcbc4c36b6bced3334c7b1d875b836db191f04535ae2bda8634fdd91c0c72c7ae5dc2f8270ce66661095ee55adaf68917870a687