diff --git a/.gitignore b/.gitignore
index 3765a73..f0721ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
 /baobab-3.34.0.tar.xz
 /baobab-3.37.90.tar.xz
 /baobab-3.38.0.tar.xz
+/baobab-40.beta.tar.xz
diff --git a/baobab.spec b/baobab.spec
index f52a09b..d9f7e70 100644
--- a/baobab.spec
+++ b/baobab.spec
@@ -1,15 +1,18 @@
-%global gtk3_version 3.20
+%global gtk3_version 3.24.1
+
+%global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           baobab
-Version:        3.38.0
-Release:        2%{?dist}
+Version:        40~beta
+Release:        1%{?dist}
 Summary:        A graphical directory tree analyzer
 
 License:        GPLv2+ and GFDL
 URL:            https://wiki.gnome.org/Apps/Baobab
-Source0:        https://download.gnome.org/sources/baobab/3.38/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/baobab/40/%{name}-%{tarball_version}.tar.xz
 
 BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -30,7 +33,7 @@ directory size or percentage in the branch.  It also auto-detects in real-time
 any change made to your home folder as far as any mounted/unmounted device.
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 
 %build
@@ -63,6 +66,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.baobab.des
 
 
 %changelog
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+
 * 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/sources b/sources
index 7f71a3f..4568dcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (baobab-3.38.0.tar.xz) = 764fc97ccab01d056fb657cda3c04e742d865e4c6ca16d4a5212a9d5470e961c8fe3523a27ab28945c38c25c1155903897e178b9ffaf0a6c07c6a044e29a750c
+SHA512 (baobab-40.beta.tar.xz) = bf9a1f62c3b7b234fe9c83da2f76db38d0bc963401b4b35d6255c61386ef7a0f1aa6f3039caf41e2db1b1649e3d53b902fb10ff16a9e9f4d848c1653c868d24a