diff --git a/shells/yash/Makefile b/shells/yash/Makefile
index ee7e41ab1cd..8419d4d9c3f 100644
--- a/shells/yash/Makefile
+++ b/shells/yash/Makefile
@@ -1,6 +1,6 @@
 COMMENT=	POSIX-compliant command line shell
 
-VERSION=	2.57
+VERSION=	2.58
 DISTNAME=	yash-${VERSION}
 CATEGORIES=	shells
 HOMEPAGE=	https://magicant.github.io/yash/
diff --git a/shells/yash/distinfo b/shells/yash/distinfo
index 00244279269..cfb9cf07bc0 100644
--- a/shells/yash/distinfo
+++ b/shells/yash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yash-2.57.tar.xz) = 9f8zNNz6D93jiC9d8AJiP0agpPKyM159kXFVINj7Has=
-SIZE (yash-2.57.tar.xz) = 771228
+SHA256 (yash-2.58.tar.xz) = GgJ0lqa40qqUbQsTQH/cPVAw8dF/CbJ3aJZ8UPCeYfA=
+SIZE (yash-2.58.tar.xz) = 785932
diff --git a/shells/yash/patches/patch-tests_ppid-p_tst b/shells/yash/patches/patch-tests_ppid-p_tst
new file mode 100644
index 00000000000..44c2a5cd32a
--- /dev/null
+++ b/shells/yash/patches/patch-tests_ppid-p_tst
@@ -0,0 +1,12 @@
+Index: tests/ppid-p.tst
+--- tests/ppid-p.tst.orig
++++ tests/ppid-p.tst
+@@ -4,7 +4,7 @@ posix="true"
+ 
+ test_OE -e 0 'PPID is parent process ID'
+ echo $PPID >variable.out
+-echo $(ps -o ppid= $$) >ps.out
++echo $(ps -o ppid= -p $$) >ps.out
+ diff variable.out ps.out
+ __IN__
+ 
diff --git a/shells/yash/patches/patch-variable_c b/shells/yash/patches/patch-variable_c
index 2f9b5780a60..cbd6b37e6a0 100644
--- a/shells/yash/patches/patch-variable_c
+++ b/shells/yash/patches/patch-variable_c
@@ -1,7 +1,7 @@
 Index: variable.c
 --- variable.c.orig
 +++ variable.c
-@@ -1110,7 +1110,7 @@ void variable_set(const wchar_t *name, variable_T *var
+@@ -1107,7 +1107,7 @@ void variable_set(const wchar_t *name, variable_T *var
                      && var->v_value != NULL) {
                  unsigned long seed;
                  if (xwcstoul(var->v_value, 0, &seed)) {
diff --git a/shells/yash/pkg/PLIST b/shells/yash/pkg/PLIST
index 9594be88fae..37981437ce8 100644
--- a/shells/yash/pkg/PLIST
+++ b/shells/yash/pkg/PLIST
@@ -67,6 +67,7 @@ share/yash/completion/fgrep
 share/yash/completion/file
 share/yash/completion/find
 share/yash/completion/fold
+share/yash/completion/fzy
 share/yash/completion/gawk
 share/yash/completion/getconf
 share/yash/completion/getopts
@@ -105,6 +106,7 @@ share/yash/completion/git-reflog
 share/yash/completion/git-remote
 share/yash/completion/git-request-pull
 share/yash/completion/git-reset
+share/yash/completion/git-restore
 share/yash/completion/git-rev-list
 share/yash/completion/git-rev-parse
 share/yash/completion/git-revert