diff --git a/yelp-tools-3.38.0.tar.xz b/yelp-tools-3.38.0.tar.xz
deleted file mode 100644
index ac9d8f9..0000000
--- a/yelp-tools-3.38.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
-size 213692
diff --git a/yelp-tools-40.0.tar.xz b/yelp-tools-40.0.tar.xz
new file mode 100644
index 0000000..ca1a5f3
--- /dev/null
+++ b/yelp-tools-40.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae
+size 38708
diff --git a/yelp-tools.changes b/yelp-tools.changes
index deeef3c..8137aea 100644
--- a/yelp-tools.changes
+++ b/yelp-tools.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Sat Mar 20 18:17:47 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 40.0:
+  + No changes since version 40.rc.
+
+-------------------------------------------------------------------
+Thu Mar 18 09:10:42 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 40.rc:
+  + Added --skip option to skip files in yelp-check.
+  + Custom checkers in yelp-check return 1 on failure.
+- Drop 6.patch: merged upstream,
+
+-------------------------------------------------------------------
+Tue Feb 16 13:07:45 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 6.patch: Use /usr/bin/python3 as shebang.
+
+-------------------------------------------------------------------
+Mon Feb 15 11:36:30 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update to version 40.beta:
+  + Added --skip option to skip files in yelp-check.
+  + Custom checkers in yelp-check return 1 on failure.
+
+-------------------------------------------------------------------
+Tue Feb  9 11:22:43 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 40.alpha:
+  + First release using the meson build system
+  + Converted yelp-build, yelp-check, and yelp-new to python
+  + New and improved templates for yelp-new
+  + Support for .yelp-tools.cfg config file
+  + Config file can specify custom checkers, like Schematron but easier
+  + yelp-check hrefs takes a configurable allow list
+- Switch to meson build system:
+  + Add meson and python3-lxml BuildRequires.
+  + Replace configure/make/make_install with respective
+    meson/meson_build/meson_install.
+
 -------------------------------------------------------------------
 Mon Sep 14 10:27:10 UTC 2020 - dimstar@opensuse.org
 
diff --git a/yelp-tools.spec b/yelp-tools.spec
index 4e8f5f3..c598279 100644
--- a/yelp-tools.spec
+++ b/yelp-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yelp-tools
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,20 @@
 
 
 Name:           yelp-tools
-Version:        3.38.0
+Version:        40.0
 Release:        0
 Summary:        Collection of utilities to help create documentation
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Other
 URL:            https://projects.gnome.org/yelp/
-Source:         https://download.gnome.org/sources/yelp-tools/3.38/%{name}-%{version}.tar.xz
+Source:         https://download.gnome.org/sources/yelp-tools/40/%{name}-%{version}.tar.xz
 BuildRequires:  itstool
 BuildRequires:  libxml2-tools
 BuildRequires:  libxslt
+BuildRequires:  meson
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(yelp-xsl)
+BuildRequires:  python3-lxml
+BuildRequires:  pkgconfig(yelp-xsl) >= 3.38.0
 Requires:       itstool
 Requires:       libxml2-tools
 Requires:       libxslt
@@ -41,18 +43,18 @@ lifting is done by packages like yelp-xsl and itstool. This package just
 wraps things up in a developer-friendly way.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%configure
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %{_bindir}/yelp-build
 %{_bindir}/yelp-check
 %{_bindir}/yelp-new