diff --git a/srcpkgs/yaml/template b/srcpkgs/yaml/template
deleted file mode 100644
index d513d090f9a..00000000000
--- a/srcpkgs/yaml/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'yaml'
-pkgname=yaml
-version=1.13.1
-revision=1
-build_style=go
-go_import_path="github.com/mikefarah/yaml"
-hostmakedepends="git"
-short_desc="A lightweight and portable command-line YAML processor written in go"
-maintainer="maxice8 <thinkabit.ukim@gmail.com>"
-license="MIT"
-homepage="https://github.com/mikefarah/yaml"
-distfiles="https://github.com/mikefarah/yaml/archive/${version}.tar.gz"
-checksum=5512c586c6dd4f9b838d80facde656153b4fe3c1ce4992cc3057f0930fec4c7a
-
-do_check() {
-	go test -v
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/yq-go/INSTALL.msg b/srcpkgs/yq-go/INSTALL.msg
new file mode 100644
index 00000000000..eb148d88a4f
--- /dev/null
+++ b/srcpkgs/yq-go/INSTALL.msg
@@ -0,0 +1,2 @@
+the binary was renamed from yaml to yq-go to follow upstream but not
+conflict with the original yq.
diff --git a/srcpkgs/yaml/patches/Disable-failing-test.patch b/srcpkgs/yq-go/patches/Disable-failing-test.patch
similarity index 100%
rename from srcpkgs/yaml/patches/Disable-failing-test.patch
rename to srcpkgs/yq-go/patches/Disable-failing-test.patch
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
new file mode 100644
index 00000000000..3f96c911870
--- /dev/null
+++ b/srcpkgs/yq-go/template
@@ -0,0 +1,27 @@
+# Template file for 'yq-go'
+pkgname=yq-go
+version=1.14.0
+revision=1
+wrksrc="yq-${version}"
+build_style=go
+go_import_path="github.com/mikefarah/yq"
+hostmakedepends="git"
+short_desc="A lightweight and portable command-line YAML processor written in go"
+maintainer="maxice8 <thinkabit.ukim@gmail.com>"
+license="MIT"
+homepage="https://github.com/mikefarah/yq"
+distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz"
+checksum=cf61f84033ed8e1cb146798bfcedfabba5fa8852331a90122eafaae0f31c4b70
+replaces="yaml>=0"
+
+do_check() {
+	go test -v
+}
+
+post_install() {
+	# this came after yq 'the jq wrapper for yaml' so yq has the right tp
+	# /usr/bin/yq, rename it to yq-go
+	mv -v "${DESTDIR}"/usr/bin/{yq,yq-go}
+
+	vlicense LICENSE
+}