diff --git a/pim-sieve-editor-21.03.90.tar.xz b/pim-sieve-editor-21.03.90.tar.xz
deleted file mode 100644
index ad6694a..0000000
--- a/pim-sieve-editor-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d4406b7d0acfce83002f679ebd44c22d744663e8fac6e0aa4ac4ef772ac6304
-size 458120
diff --git a/pim-sieve-editor-21.03.90.tar.xz.sig b/pim-sieve-editor-21.03.90.tar.xz.sig
deleted file mode 100644
index 812f480..0000000
--- a/pim-sieve-editor-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsEACgkQu0YzUNbv
-Me8n6Q//X91AKBbl9++USNDWacRTc2ZTYTkwuyCYb0qf5G5+eihVzsl++fi4QqcV
-N9QFcukfmZ3ydTMgDypcAmdEmnXlWqt4mfw6+e4mGdoQcXkNFzx/XA9NNMRQlXbF
-KSf89thxVElr8c+52Ye/WxbM2T1iA79lHUpr2L8r09kLDH7iOnBeQ+zQlKJbrYfW
-DRk49UYEZPgjgy7jzCUkfZRfHIFh0C3Ui8X1ysTWM7CpRaIXnhD24f6TxQAtjz8y
-uDSDyHI1IkdF4pWw8ivUhODd4QhPSKcNvIr5b4ywEcnnnFKPbA77P1PvPeQPYhAm
-eGDByzCpZAKAwUmnfdGHOWLUQXgZ9c1RJfGTV5jJ40x0iOqOD4tferzpMTpg8/6m
-zWJtVRrYqQAV5cBCkdmtVMwqnK3QdRWNsw4JLrgR0qrF/GYPamsqZs5nwpVnmm+h
-9cfCc5fKo8ya1EoCZHu8eqgnCGl5w9c+kQQrF9rsjio0zsYJrALEZXBCuNcbwpWY
-F7x2i5vz+cNnw3NE9l5RjvRE/+68iDkVjLcv+svnpzl4I2n1x2VaR2sU+bMFYM7M
-LY/th2gBZxLwNrDV7NzNhbzm/kXGknPO1q0bogkLR3XDKSFQBRLx4ThVnt3/VOS3
-UL/iJJLdQtDGiAIQeNrxOmIx7fMINbarFQNHywvO55gPe+Tql2o=
-=+M2R
------END PGP SIGNATURE-----
diff --git a/pim-sieve-editor-21.04.0.tar.xz b/pim-sieve-editor-21.04.0.tar.xz
new file mode 100644
index 0000000..a8f2d7a
--- /dev/null
+++ b/pim-sieve-editor-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e049b164d8a5daca13eeda386932795cd1ffee0671262354f323fbd4024acfb
+size 458088
diff --git a/pim-sieve-editor-21.04.0.tar.xz.sig b/pim-sieve-editor-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..41b086a
--- /dev/null
+++ b/pim-sieve-editor-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwoACgkQu0YzUNbv
+Me/DVg/+L/+wLIUQk5ZGr8OPOPTpllKUVVqz9CPsZkBYg8dV6mTnv0CcSnrsy1Ch
+Zt+4Yz9ZeQdhwrw8uOQJeH0osWn7yPHth+1IyR2l4dexhhG2ArgagoYOJI2Jbk30
+3N2i9OHEbND8VxO25GOIqL45NSWp9RWEYVvpJHh2hk3hPpnehfWsGd+dJe1BGyZD
+0+lC2/EO6NSH5WwzpovOpA64yTtcLCXtvWUqRfciihpaGLa4pZAtHbiMLiCrXJH0
+qzg3A8LtvM6JoC3n9kT4C7+UMRVzdMoz22Ag52z286F+LoYAw21gW9zm4/D3nJ7Z
+rp+9Os31mrpDWiWzjR0ToEMIuemQ5IaszADf1G8YHyLeKW5Skq5qhrAwR02ydf/S
+UGj35QAG3ajFNjS1ZsEZ1JbeXjq9hO/PSobhGFZPpEq0kdekdlD1P5usRuTNPOvd
+6p4bcc1tplI5WJv09RhiLe0I+eg/xqKwKwi2k70g9wweUq0di9keO4sIZJhqP9H6
+Zr6EVI1itTRvkAWv86AxdZKXFesPkaSvNH2Uhsd7NIW3GvFcHRaOM0rJdnyVGw1J
+ejwewCOW/pWenaP/wm0sgLqVj2Z8pMQqx9k6ReF+O0Xd74TlE7zB1fb/OG+0rGiC
+zrGlG+B9m73FpA6wwbxrvk1ti+CYiqKgQyO1HL5iFfGOCtJSzgc=
+=xRqM
+-----END PGP SIGNATURE-----
diff --git a/pim-sieve-editor.changes b/pim-sieve-editor.changes
index b413580..d78e831 100644
--- a/pim-sieve-editor.changes
+++ b/pim-sieve-editor.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:23 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:41:48 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/pim-sieve-editor.spec b/pim-sieve-editor.spec
index 6ab080d..3ef9a0c 100644
--- a/pim-sieve-editor.spec
+++ b/pim-sieve-editor.spec
@@ -16,18 +16,22 @@
 #
 
 
-%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:           pim-sieve-editor
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
-Summary:        Sieve scripts editor for KDE PIM
+Summary:        Sieve scripts editor for KDE PIM applications
 License:        GPL-2.0-or-later AND 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
+URL:            https://apps.kde.org/sieveeditor
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 BuildRequires:  extra-cmake-modules
 # Is only required for the icon
 BuildRequires:  kmail-application-icons
@@ -53,10 +57,6 @@ Requires:       kmail
 Recommends:     %{name}-lang
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 This package provides an editor, complete with syntax highlighting and
@@ -66,7 +66,7 @@ in KDE PIM applications.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build
@@ -85,15 +85,15 @@ in KDE PIM applications.
 
 %files
 %license LICENSES/*
-%{_kf5_debugdir}/sieveeditor.categories
-%{_kf5_debugdir}/sieveeditor.renamecategories
 %doc %lang(en) %{_kf5_htmldir}/en/sieveeditor/
 %{_kf5_applicationsdir}/org.kde.sieveeditor.desktop
+%{_kf5_appstreamdir}/org.kde.sieveeditor.appdata.xml
 %{_kf5_bindir}/sieveeditor
 %{_kf5_configkcfgdir}/sieveeditorglobalconfig.kcfg
+%{_kf5_debugdir}/sieveeditor.categories
+%{_kf5_debugdir}/sieveeditor.renamecategories
 %{_kf5_libdir}/libsieveeditor.so.*
 %{_kf5_sharedir}/kconf_update/
-%{_kf5_appstreamdir}/org.kde.sieveeditor.appdata.xml
 
 %if %{with lang}
 %files lang -f %{name}.lang