diff --git a/kalarm-21.03.90.tar.xz b/kalarm-21.03.90.tar.xz
deleted file mode 100644
index e418378..0000000
--- a/kalarm-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b012d50b85e06893e1d60866f07738350ed5e012f1533d0bcf44cf55ed5e58a9
-size 2074492
diff --git a/kalarm-21.03.90.tar.xz.sig b/kalarm-21.03.90.tar.xz.sig
deleted file mode 100644
index cb73e4c..0000000
--- a/kalarm-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrkACgkQu0YzUNbv
-Me/jJA/+KcWuw5DmF0NNLSHvxPPlrtem4FSx0QJico9tYfHq1/00Rsl3fy6ewIa9
-yGJ88PkdgSm89EO3f+pwTXvYk9bLJxfTYpWKmdaUwhN8cNf6senViMI6lLLWkv9k
-M0MoaZJDre1cCKto3lYXMYd15c+uj2SbNq6jxQS35NLKYEP8eMpA2iTSvyksVM1C
-oh0f8hi0LKT78ngenbHkDNDBybOW+qK6jo6FHlIgEY32JnL2xohppccaT9Ef84uM
-mg1ijNgQLJ9G6j7sknwvdXCUjjL67LRnsvq4watO1DYMtyNrGWDiqXtgbOQtqQ49
-vrESrASwxiHGFfa3VueG9RxN1mnwMQvQX2ljjTef7sqgjFiQwuDorAPsvZ3YHew3
-6csAQzhx0dlRrxWcfdixd+P3PzllHEt3NwuXw2BFLeONQRvbbUsMrh06zvAdWzL3
-X80iTvv6Wr2wIFO6x/9iou8oWWQioNBwdczPMmJFk/Awl7WqDEbkt9k83Yl5e4lC
-c7EXb6Xc2PWvIg77KdHMo/6ICYIFhUuX/6qJTwo3y/qyehXiaiTcOyLOLZRho8vB
-RLc1hFXsUixyV92ncK86NhHGS5nLhk3qhpckQCMZPdBG+CRvnUbYzqrNLZk0lzKO
-Fq8sq8Hpj2PDLk2W40jtSeJtvLjBfdSCJXxgzBSsp1ICuEq/bZE=
-=dAxp
------END PGP SIGNATURE-----
diff --git a/kalarm-21.04.0.tar.xz b/kalarm-21.04.0.tar.xz
new file mode 100644
index 0000000..fa7a06f
--- /dev/null
+++ b/kalarm-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2250a8fee91268be83bc5125858290e6a3239da5dd5810688f09364dad619efd
+size 2074536
diff --git a/kalarm-21.04.0.tar.xz.sig b/kalarm-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..dc5864b
--- /dev/null
+++ b/kalarm-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvUACgkQu0YzUNbv
+Me+ZFQ//Vq71jpvcV7PDY6wYeFsILyFPAEn3Jb4hVbhLQJYI4sz/v9iXy6THSKnh
+v+jA07o9pfOJicyIwj7QpJPDmX+P+NaH17VqaXIs2TNhnqd1p18LmFXaDbzyRdFJ
+4lfwmS6LrV7KNP/3KfX9oBp6Uj9WaMbi/yf7p1Y5seZUHsFqSB4xjAtav1zjcZQN
+GB/re2edLiW82s/u86qlBtB4a/hpR0EV5LOkcDt1qk9j0VrV4e+XOCVvEXCXkhGW
+FhfxEK5UJUvTLKaWRyR2S+wwb4RaKC5QQqzmV2xe1dHjBh+2+p+jSCRqpf/xzgQr
+iohnWY6SYuGU3I9wJuigPtVox/n6wQu1rNzMYkKLb+QU8IdKO9D3JbqtOYuDM0Jw
+PkScp1n9F4NQhdCli823QzIZe3eEZ1nusA74gF2/70JkI4ZTKfwtaDD1Xayr3uF9
+SIE3wsEaZ+rYSGOZUR+FIMhhUTjTudz+Vr/yJBh5CKj9FCzahpfXShM+Xo0mmJVM
+lex2vsbc2XN4BMMCEeNkR6qW+gJQ2GiJ4bi6OhwZfNDwuSAn5/fkPz4ppwCNrc3g
+SNPGOG1HRRcrJccxW0Cac7iDOGqNdZ1pD0K48KQjGz09nIwmoNpsmwrhI9jLjaXX
+7LspMoYQsQ/YuXkIxC8RVZnH1qzt3iIu+hyYuZ4ilneqnlqhfbU=
+=5dGd
+-----END PGP SIGNATURE-----
diff --git a/kalarm.changes b/kalarm.changes
index 95abc88..019fa06 100644
--- a/kalarm.changes
+++ b/kalarm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:20 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
+- No code change since 21.03.90
+
 -------------------------------------------------------------------
 Fri Apr  9 17:39:47 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kalarm.spec b/kalarm.spec
index 9f26ee9..6db0995 100644
--- a/kalarm.spec
+++ b/kalarm.spec
@@ -16,20 +16,20 @@
 #
 
 
-%define kf5_version 5.75.0
+%define kf5_version 5.79.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kalarm
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Personal Alarm Scheduler
 License:        GPL-2.0-only
 Group:          Productivity/Other
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kalarm
+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
@@ -85,12 +85,12 @@ Obsoletes:      kalarm5 < %{version}
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
 
 %description
-Personal alarm message, command and email scheduler for KDE
+Personal alarm message, command and email scheduler by KDE.
 
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build
@@ -107,20 +107,20 @@ Personal alarm message, command and email scheduler for KDE
 %files
 %license LICENSES/*
 %doc README
-%{_kf5_debugdir}/kalarm.categories
-%{_kf5_debugdir}/kalarm.renamecategories
-%{_kf5_dbuspolicydir}/org.kde.kalarm.rtcwake.conf
-%dir %{_libdir}/libexec/kauth/
+%config %{_kf5_configdir}/autostart/kalarm.autostart.desktop
+%doc %lang(en) %{_kf5_htmldir}/en/kalarm/
 %{_kf5_applicationsdir}/org.kde.kalarm.desktop
 %{_kf5_appstreamdir}/org.kde.kalarm.appdata.xml
 %{_kf5_bindir}/kalarm*
-%config %{_kf5_configdir}/autostart/kalarm.autostart.desktop
 %{_kf5_configkcfgdir}/kalarmconfig.kcfg
 %{_kf5_dbusinterfacesdir}/org.kde.kalarm.kalarm.xml
-%doc %lang(en) %{_kf5_htmldir}/en/kalarm/
+%{_kf5_dbuspolicydir}/org.kde.kalarm.rtcwake.conf
+%{_kf5_debugdir}/kalarm.categories
+%{_kf5_debugdir}/kalarm.renamecategories
 %{_kf5_iconsdir}/hicolor/*/apps/kalarm.png
-%{_kf5_libdir}/libexec/kauth/kalarm_helper
 %{_kf5_kxmlguidir}/kalarm/
+%dir %{_libdir}/libexec/kauth/
+%{_kf5_libdir}/libexec/kauth/kalarm_helper
 %{_kf5_notifydir}/kalarm.notifyrc
 %{_kf5_sharedir}/dbus-1/system-services/org.kde.kalarm.rtcwake.service
 %{_kf5_sharedir}/kalarm/