diff --git a/u-boot.changes b/u-boot.changes
index 597a1db..1b8e01c 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  1 09:36:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Build with arm-trusted-firmware for Tumbleweed
+- Drop unused uboot_atf_pine64 option
+
 -------------------------------------------------------------------
 Tue Feb 16 19:58:28 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
 
diff --git a/u-boot.spec b/u-boot.spec
index e74ab41..0824733 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -206,8 +206,12 @@ ExclusiveArch:  do_not_build
 %endif
 %endif
 %endif
+%if 0%{?suse_version} > 1500
+# arm-trusted-firmware is only in Tumbleweed
+%bcond_without uboot_atf
+%else
 %bcond_with uboot_atf
-%bcond_with uboot_atf_pine64
+%endif
 Version:        2021.01
 Release:        0
 Summary:        The U-Boot firmware for the %target platform