diff --git a/srcpkgs/ponysay/patches/fish-completion-vendor.patch b/srcpkgs/ponysay/patches/fish-completion-vendor.patch
new file mode 100644
index 00000000000..e715323f26c
--- /dev/null
+++ b/srcpkgs/ponysay/patches/fish-completion-vendor.patch
@@ -0,0 +1,30 @@
+# upstream: yes
+
+From dd922c09bbe5deb808152140679673e8dca3210d Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 21 Jan 2020 23:55:44 -0500
+Subject: [PATCH] fix incorrect install dir for fish completion
+
+fish completions should never be installed to share/fish/completions/ as
+that directory is reserved exclusively for completions shipped as part
+of the fish source code.
+
+Use the same vendor_completions.d/ directory which the default fish
+configuration uses.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 17f12efd..5728a23f 100755
+--- setup.py
++++ setup.py
+@@ -28,7 +28,7 @@
+ commands = ['ponysay', 'ponythink', 'ponysay-tool']
+ 
+ shells = [('bash', '/usr/share/bash-completion/completions/ponysay', 'GNU Bash'),
+-          ('fish', '/usr/share/fish/completions/ponysay.fish', 'Friendly interactive shell'),
++          ('fish', '/usr/share/fish/vendor_completions.d/ponysay.fish', 'Friendly interactive shell'),
+           ('zsh', '/usr/share/zsh/site-functions/_ponysay', 'zsh')]
+ 
+ mansections = [('ponysay', '6'),
diff --git a/srcpkgs/ponysay/template b/srcpkgs/ponysay/template
index 900ff4d94c2..0f4d07152c5 100644
--- a/srcpkgs/ponysay/template
+++ b/srcpkgs/ponysay/template
@@ -1,14 +1,14 @@
 # Template file for 'ponysay'
 pkgname=ponysay
 version=3.0.3
-revision=2
+revision=3
 archs=noarch
 hostmakedepends="python3 texinfo"
 depends="python3"
 short_desc="Pony rewrite of cowsay"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
-homepage="http://erkin.github.com/ponysay/"
+license="GPL-3.0-or-later"
+homepage="https://erkin.github.com/ponysay/"
 distfiles="https://github.com/erkin/${pkgname}/archive/${version}.tar.gz"
 checksum=c382d7f299fa63667d1a4469e1ffbf10b6813dcd29e861de6be55e56dc52b28a