diff --git a/community/fzf/APKBUILD b/community/fzf/APKBUILD
index 45cabd9f6fbbdc8482550fcec3511206f38ff6f3..c3beeaeeb5bc229a9f688c324dc832602753d52c 100644
--- a/community/fzf/APKBUILD
+++ b/community/fzf/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=fzf
-pkgver=0.24.4
+pkgver=0.25.0
 pkgrel=0
 pkgdesc="A command-line fuzzy finder"
 url="https://github.com/junegunn/fzf"
@@ -20,6 +20,7 @@ subpackages="
 	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/junegunn/fzf/archive/$pkgver.tar.gz
 	find-buzybox-compat.patch
+	use-explicit-int-to-string-conversion.patch
 	"
 
 export GOPATH="$srcdir"
@@ -99,5 +100,6 @@ cleanup_srcdir() {
 	default_cleanup_srcdir
 }
 
-sha512sums="348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821  fzf-0.24.4.tar.gz
-c59e7eb712f5072a2c66b79800f7674d1f9208b1ead4f654e57f8dcb673a45a751725a005c89759847f78c7ae7f246980b2c94e5fff5a3e8c2f6a364965e567e  find-buzybox-compat.patch"
+sha512sums="73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3  fzf-0.25.0.tar.gz
+c59e7eb712f5072a2c66b79800f7674d1f9208b1ead4f654e57f8dcb673a45a751725a005c89759847f78c7ae7f246980b2c94e5fff5a3e8c2f6a364965e567e  find-buzybox-compat.patch
+b0776a0e0f33328d68eb759719ea8cca9cb4c580c5f8ffe3f55763c8a2aa366563b1d7da11f5f817b7a73ca22aaf7167b68e4de55916461ac3383d822ab4aed5  use-explicit-int-to-string-conversion.patch"
diff --git a/community/fzf/use-explicit-int-to-string-conversion.patch b/community/fzf/use-explicit-int-to-string-conversion.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7393f20a8149db050a17a1336d2370d7204df7d7
--- /dev/null
+++ b/community/fzf/use-explicit-int-to-string-conversion.patch
@@ -0,0 +1,36 @@
+From cab32ead2291fdbe5f5c284c71a693705533c700 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Sat, 2 Jan 2021 23:25:43 -0500
+Subject: [PATCH] Use more explicit int-to-string conversion.
+
+This fixes the following errors with Go 1.15:
+```
+src/options.go:452:69: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
+src/options.go:463:33: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
+```
+---
+ src/options.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/options.go b/src/options.go
+index 12c09556..cee11ffc 100644
+--- a/src/options.go
++++ b/src/options.go
+@@ -449,7 +449,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
+ 		errorExit(message)
+ 	}
+ 
+-	str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma))
++	str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma}))
+ 	tokens := strings.Split(str, ",")
+ 	if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") {
+ 		tokens = append(tokens, ",")
+@@ -460,7 +460,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
+ 		if len(key) == 0 {
+ 			continue // ignore
+ 		}
+-		key = strings.ReplaceAll(key, string(escapedComma), ",")
++		key = strings.ReplaceAll(key, string([]rune{escapedComma}), ",")
+ 		lkey := strings.ToLower(key)
+ 		add := func(e tui.EventType) {
+ 			chords[e.AsEvent()] = key