diff --git a/kitinerary-21.03.90.tar.xz b/kitinerary-21.03.90.tar.xz
deleted file mode 100644
index 876831b..0000000
--- a/kitinerary-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6d6c273bdd3a347eca85a5ce966fdeed55d8b007500c07026226d06a24584ec
-size 1820416
diff --git a/kitinerary-21.03.90.tar.xz.sig b/kitinerary-21.03.90.tar.xz.sig
deleted file mode 100644
index c66bee0..0000000
--- a/kitinerary-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrwACgkQu0YzUNbv
-Me8b+Q/9FNqXRdG7chnp0CFLDW/ZqLiWSLG8tgkgAHNHltpAtzSIlVtp7u8WKDeV
-I1WdbyoJLJKtxXmvf0RODcmpdtqqUi7/VY2FhgRwEJQRCocMeVGhHoXnvgFpBd+C
-4u4o0ffdA2nrXbpmO3FFnwlpz5aC5HNr0DYGlAcKnn3lpjDGoBD7e4bJlGwVx2q4
-mamFcruVzW21EKe2+/u6OOgN82rfFL844C8xa0LaHr/VXap5o0iVAFpqMc3KAw5o
-8bW4JNyHYSd+hM88cUVUqIoUFTCpM9SwfHIi/WI0qdr7FGrBZ89dJ/2i/SKmlk1Z
-4NeAmB5JPHVKndoiMQzTrBXLFewdkT0ZpiCI9ZHoDViNkwyhYJNdE/BpEMiUwis+
-/E4Dz17L46SMwoGdftEyoDb/Pfdl0cyzkqKIYV9c50dBM4ROJiU85iqg7RD4CJOK
-A34nOQ0XNucKhsoYh4GMH1VW7iST3auL63eJKTSkJbyfZnwVM8n1lXt5tM/pjy0h
-EggeZPLwZ3XEO/aVi0qeCPWWNKopuDKu9FYZq/dyN3JEFGErh967cuS521Iu+Xc/
-u37dmj0it8QMS8fMbXyBZhaIOUrYxn1FAUq9xRruVuH+UBaKZiSnvT0rRfKAgAMs
-BAhZJ38CmIB6xGM/99UzdS+lbVv0n1zWztRAc+sHmrWhTR1SlIM=
-=Es/2
------END PGP SIGNATURE-----
diff --git a/kitinerary-21.04.0.tar.xz b/kitinerary-21.04.0.tar.xz
new file mode 100644
index 0000000..a13f2a8
--- /dev/null
+++ b/kitinerary-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ed2fe97f5f0120e977151fe1becc840806ee3796c280146b11287089860bf6b
+size 1819260
diff --git a/kitinerary-21.04.0.tar.xz.sig b/kitinerary-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..40f4d1c
--- /dev/null
+++ b/kitinerary-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me+bqxAAha/gTUwbMEMj9T5aKTJZpGu0sqxwpAbTJsQcV0hqKs1+RldQUnq0xBiX
+G8RyONFVPWhnWazDh/Ls36ckzaJV7t2x0r1qcWuZVyCi/AcMdAME0XVInZY+POL2
+QRNw1GtCiDX3vQJKM9G6LwPAsXn4FXuqQfvHKr24eeTpFeg+izlOwvpIdIGIFAQg
+p2ahfL0W5KTa5F0Iwom2ZQUdYj/pKUnzRyipvgAlqqFQu2cisal5KE/SLEpQoslH
+dL71vOCauTmmQalMaO8Z1Upgefz/cQQwdc/9h1NEk8Vj4lm7krBOUUb4Xst92GF0
+AFCoxrnMLXE+J+NFzzMkMdj+UliA6mxS/D+vQz9GtnVZftI9TLGXzm8UhQvCrBGc
+OlS5Q8sN+y17szfeHFCQmxENTa6bBK9+GSX0fTHeY465bcITvZfaEvf3Thw/B0LL
+0M2QIsu43NHw+uskqexdEyDbgiAq8z8rUk5s+YYteysz72m7TRcZe3g7x8NyR6T3
+P2kIzbMK301IBw5AI/yoptE5WsArskjXisBBz+O3KOUPXhCDjQuXxoVHR3xRjrRo
+SV+mvAACRyxsACT7tS8lUis/52tu5aJXFw3A4gD4pdVeFTRe7v4FwVsVTRqrG+Kn
+D30Uh5HFUExwkAacPrCQba09zdfypBzwXVeQb1yUnV4Fs0Jgujk=
+=cmue
+-----END PGP SIGNATURE-----
diff --git a/kitinerary.changes b/kitinerary.changes
index b7c3ff7..c1a1863 100644
--- a/kitinerary.changes
+++ b/kitinerary.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:04 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/21.04.0
+- Changes since 21.03.90:
+  * KItinerary doesn't build as a unity build, so don't even try that
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:40:31 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kitinerary.spec b/kitinerary.spec
index 5c09803..000188b 100644
--- a/kitinerary.spec
+++ b/kitinerary.spec
@@ -18,15 +18,15 @@
 
 %bcond_without lang
 Name:           kitinerary
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Data model and extraction system for travel reservations
 License:        LGPL-2.1-or-later
 Group:          System/GUI/KDE
 URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif
 BuildRequires:  extra-cmake-modules
@@ -81,7 +81,7 @@ to build programs that use the kitinerary library.
 %lang_package -n libKPimItinerary5
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build -- -DBUILD_TESTING=ON
@@ -102,8 +102,6 @@ to build programs that use the kitinerary library.
 
 %files
 %license LICENSES/*
-%dir %{_kf5_sharedir}/mime
-%dir %{_kf5_sharedir}/mime/packages
 %{_kf5_libexecdir}/kitinerary-extractor
 %{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml