diff --git a/installation-images-16.59.tar.xz b/installation-images-16.59.tar.xz
deleted file mode 100644
index 38f6185..0000000
--- a/installation-images-16.59.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d5658c1623fa9b70eef6f1fcb817d0c131720b561062cbd66e5526d8ead2fa0
-size 189604
diff --git a/installation-images-16.60.tar.xz b/installation-images-16.60.tar.xz
new file mode 100644
index 0000000..6c7fb00
--- /dev/null
+++ b/installation-images-16.60.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d728b4b98fbc1d11ee89d009dd66bc3bd5b99088f8cc4d8c2715d35de5fc65a
+size 189696
diff --git a/installation-images.changes b/installation-images.changes
index 35c5d20..a5a7669 100644
--- a/installation-images.changes
+++ b/installation-images.changes
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------
+Thu Apr 8 11:58:15 UTC 2021 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/installation-images#450
+- Add support for riscv64
+- 16.60
+
 --------------------------------------------------------------------
 Wed Apr 7 12:11:40 UTC 2021 - wfeldt@opensuse.org
 
diff --git a/installation-images.spec b/installation-images.spec
index ddef0c6..1ff187d 100644
--- a/installation-images.spec
+++ b/installation-images.spec
@@ -54,6 +54,9 @@ ExclusiveArch:  do_not_build
 %ifarch ppc64 ppc64le
 %define the_arch ppc
 %endif
+%ifarch riscv64
+%define the_arch riscv
+%endif
 
 # ===  sort out which flavor to build  ===
 
@@ -69,7 +72,7 @@ ExclusiveArch:  do_not_build
 %define net_repo https://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
 %else
 %define with_exfat 1
-%ifarch %arm aarch64 ppc64 ppc64le
+%ifarch %arm aarch64 ppc64 ppc64le riscv64
 %define net_repo https://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
 %else
 %define net_repo https://download.opensuse.org/tumbleweed/repo/oss
@@ -282,7 +285,7 @@ BuildRequires:  plymouth-branding-%branding_plymouth
 %ifarch %ix86 x86_64
 BuildRequires:  gfxboot-branding-%branding_gfxboot
 %endif
-%ifarch %ix86 x86_64 aarch64
+%ifarch %ix86 x86_64 aarch64 riscv64
 BuildRequires:  grub2-branding-%branding_grub2
 %endif
 
@@ -462,7 +465,9 @@ BuildRequires:  plymouth-scripts
 BuildRequires:  plymouth-theme-tribar
 %endif
 BuildRequires:  klogd
+%ifnarch riscv64
 BuildRequires:  ltrace
+%endif
 BuildRequires:  nscd
 BuildRequires:  polkit
 BuildRequires:  popt-devel
@@ -617,7 +622,7 @@ BuildRequires:  s390-tools-hmcdrvfs
 %ifarch %ix86 x86_64
 BuildRequires:  gfxboot-branding
 %endif
-%ifarch %ix86 x86_64 aarch64
+%ifarch %ix86 x86_64 aarch64 riscv64
 BuildRequires:  grub2-branding
 %endif
 %ifnarch s390 s390x
@@ -637,6 +642,9 @@ BuildRequires:  shim
 %ifarch %arm
 BuildRequires:  grub2-arm-efi
 %endif
+%ifarch riscv64
+BuildRequires:  grub2-riscv64-efi
+%endif
 # inst-sys module for libstoragemgmt
 BuildRequires:  libstoragemgmt-netapp-plugin
 BuildRequires:  libstoragemgmt-smis-plugin
@@ -661,7 +669,7 @@ AutoReqProv:    off
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0-or-later
 Group:          Metapackages
-Version:        16.59
+Version:        16.60
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)