diff --git a/.gitignore b/.gitignore
index 91fef66..86237e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,4 @@ orca-2.31.6.tar.bz2
 /orca-3.38.0.tar.xz
 /orca-3.38.1.tar.xz
 /orca-3.38.2.tar.xz
+/orca-40.beta.tar.xz
diff --git a/orca.spec b/orca.spec
index 6610a47..55c6bb3 100644
--- a/orca.spec
+++ b/orca.spec
@@ -1,15 +1,16 @@
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           orca
-Version:        3.38.2
-Release:        2%{?dist}
+Version:        40~beta
+Release:        1%{?dist}
 Summary:        Assistive technology for people with visual impairments
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Orca
-Source0:        https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
 
 BuildArch:      noarch
 
-BuildRequires: make
 BuildRequires:  pkgconfig(atk-bridge-2.0)
 BuildRequires:  pkgconfig(atspi-2)
 BuildRequires:  pkgconfig(liblouis)
@@ -20,6 +21,7 @@ BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  gtk3-devel
 BuildRequires:  itstool
+BuildRequires:  make
 BuildRequires:  python3-brlapi
 BuildRequires:  python3-devel
 BuildRequires:  python3-louis
@@ -40,7 +42,7 @@ applications and toolkits that support the assistive technology service
 provider interface (AT-SPI), e.g. the GNOME desktop.
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 
 %build
@@ -74,6 +76,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de
 
 
 %changelog
+* Mon Feb 22 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.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index ef3942a..3d9761a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (orca-3.38.2.tar.xz) = d725731b2636d29387cbdd456f13134cd72a3e228f0f36356d69b731ff0fd296cc876ce45866a7bd81c9db659faf9e28576652dd2e06c05605db7309e5627a2d
+SHA512 (orca-40.beta.tar.xz) = 29b7058ab822d8628f758fec4ee5a969833c91465b3ce0c4b5bba46bad8f2ef25617f0425b28bf5d6285a603c2d8b3fa43b73749c2674c1ca9d3a50638b71f0a