diff --git a/kirigami-gallery-20.12.3.tar.xz b/kirigami-gallery-20.12.3.tar.xz
deleted file mode 100644
index 630e634..0000000
--- a/kirigami-gallery-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b342c922dfd8310846127d218c8d6c36e8dd574ca8d085c323b19c587b04524
-size 328180
diff --git a/kirigami-gallery-20.12.3.tar.xz.sig b/kirigami-gallery-20.12.3.tar.xz.sig
deleted file mode 100644
index 9dc42a9..0000000
--- a/kirigami-gallery-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEIACgkQu0YzUNbv
-Me/5oQ/+Kbglw1nfSmizkYrYNzhi7FlRw27cLozOkza+vbuMHK+HJLtIqqrKIWlo
-EGK/ii7d2U7RUQg3Wk013GaoJ0J8xYb9MmUeTxkbxRFn0alblTDnfFUwSAAd/pzl
-PnwesLtzm4iRcB74oqTkRP7I5gOJMmPb+UR9NziEqDwa8zSsQy1RG1lnZj556eP5
-qRqYPHqFlyYILlVEvnMzARA/Kw2RHBoTHewsk/suBCFs9Ob+BInzgMSx5nQL6qRm
-o7OQ/M6EAfZMpEiBRwfCccjCiekVGG37WyzOg4u1x8JSNbLzt4PqKEryG2i3SszL
-OaMw+OQGpT1KRfWpwYeyoMAwawLXCMDYksJOkeHCgkpf1iHnhEB9ZT7ovy+n6s7O
-V4ZCrHroLW5HLIUznBYa3erQw/thJMFUwuSq+ZVzLNUYMfxzQuQ3b8CVAvMa+gbw
-7kA7PxBdd+JlE3LCnEzmusFFKLZxqJh5L65b4KzDNuVlmhLAno5sS2A8nd/yXX27
-34acxJ+JJZwMD9aJhI0JqVZflfZU5rOt/SB++q4VhSwEjfLMPqiOsxeg3hM+qgoy
-4vrAwpsz9itIrmErs1yMZWWeQRfPoVQS+1DYSQkkLv/oNFCrGkznJaBUm5IE4XIh
-1x8ZE1pGwvmQ3F3WO8NlthtOntZtwGMYpCEnaNK0PbZp2VXoZCw=
-=tpXK
------END PGP SIGNATURE-----
diff --git a/kirigami-gallery-21.04.0.tar.xz b/kirigami-gallery-21.04.0.tar.xz
new file mode 100644
index 0000000..8524ce5
--- /dev/null
+++ b/kirigami-gallery-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e7b759b697a5cb2bf39e752d4be57a3ec76d27348f781167d22993e23041812
+size 329296
diff --git a/kirigami-gallery-21.04.0.tar.xz.sig b/kirigami-gallery-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..11fb605
--- /dev/null
+++ b/kirigami-gallery-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me9MdA//bufnU+ALSJTiaun7fP/JoZpOY2UOvtoDSB9ZspxBxjHzYsJvS0pTlWGJ
++DxC9NYIUrKlBW/0EX8NgJFR2X5bI3tZvlrRpcMggpaYPzKeHBrvcBWASBXMPbDm
+p6X4xInvcExgUjmDh6uOYyyIx3AUGF7SFgL08zwG2wg+mkOgrtEWPUCJYW0j/wq8
+xOioCpro8alyCBVkwm2g+BtXfQ/zlQ2ymVVJnhfUuy/KseZBy0ZTrppMqIY1rq0h
+ELa+m942gQIn3A+UG3fYH/Wb9UedgfcMSAJ9AbT/ml1FYZzbYpzc6VUh1gtglRlv
+EIWr9o8OSIniKy7qvLXsJziC/fol4GifpblDe3buKa+VzT9h8J1AqvALwU0QTWcp
+jZJ0Ba9VCEc0SsCTNGfZoe5oHQlVfw1F4Oq1V2gj4h46rubgUFFJMRXT76QNlCVj
+/scEV1z2qxo5kkahBUH+UGZNy75ARGiyEdbaRlbYjChBxfNvDJP+8uCeDD9j1tA/
+Fsw3iOzef56FK2TXLZJdCsPBk+lbi88VqJyJ0pVcYppWow/uD2ULHtTL3u1VC+Ee
+bpMneKNFsTRxH/pSCUYdri6yyyXZbRKiD5jM4gQeYt/KHp/zqHCy5wR7BqgDvbyq
+p/3A1sIIUGMr24NOzqLX0jxzisyGIHqGhRro9vXqvQF0RESdwRM=
+=ketT
+-----END PGP SIGNATURE-----
diff --git a/kirigami-gallery.changes b/kirigami-gallery.changes
index d627c22..67ec7a2 100644
--- a/kirigami-gallery.changes
+++ b/kirigami-gallery.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:02 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.04
+- No code change since 21.03.90
+
+-------------------------------------------------------------------
+Fri Apr  9 17:40:28 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.90
+  * New feature release
+- Changes since 21.03.80:
+  * Add kitemmodels dependency to cmake
+
+-------------------------------------------------------------------
+Wed Mar 24 10:51:38 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Build with kpackage to get the appstream xml installed (boo#1183946)
+
+-------------------------------------------------------------------
+Sun Mar 21 13:28:14 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Change homepage url "http" to "https"
+  * Fix Android package name
+
 -------------------------------------------------------------------
 Thu Mar  4 06:10:31 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kirigami-gallery.spec b/kirigami-gallery.spec
index 0803d2e..792120a 100644
--- a/kirigami-gallery.spec
+++ b/kirigami-gallery.spec
@@ -18,15 +18,23 @@
 
 %bcond_without lang
 Name:           kirigami-gallery
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Gallery application built using Kirigami
 License:        LGPL-2.0-or-later
 Group:          Development/Tools/Other
-URL:            https://www.kde.org
+URL:            https://apps.kde.org/kirigami2.gallery
 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
+# For some reason needed for appstream xml installation
+BuildRequires:  kpackage
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5Kirigami2)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
@@ -38,10 +46,6 @@ Requires:       kitemmodels-imports
 Requires:       libqt5-qtgraphicaleffects
 Requires:       libqt5-qtquickcontrols2
 Recommends:     %{name}-lang
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 Example application which uses all features from kirigami,
@@ -52,7 +56,7 @@ code examples on cgit
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build
@@ -68,8 +72,9 @@ code examples on cgit
 
 %files
 %license LICENSE.LGPL-2
-%{_kf5_bindir}/kirigami2gallery
 %{_kf5_applicationsdir}/org.kde.kirigami2.gallery.desktop
+%{_kf5_appstreamdir}/org.kde.kirigami2.gallery.appdata.xml
+%{_kf5_bindir}/kirigami2gallery
 
 %if %{with lang}
 %files lang -f %{name}.lang