diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/sysutils/portupgrade-devel/pkg-plist
+++ b/sysutils/portupgrade-devel/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade
diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist
index 3be08857fb2d..86341cee5875 100644
--- a/sysutils/portupgrade/pkg-plist
+++ b/sysutils/portupgrade/pkg-plist
@@ -9,6 +9,7 @@ sbin/portversion
 %%RUBY_SITELIBDIR%%/portsdb.rb
 share/zsh/site-functions/_portupgrade
 share/zsh/site-functions/_portversion
-@unexec if [ ! -x %D/bin/zsh ]; then rmdir -p %D/share/zsh/site-functions; fi
+@unexec rmdir %D/share/zsh/site-functions 2>/dev/null || true
+@unexec rmdir %D/share/zsh 2>/dev/null || true
 %%PORTDOCS%%share/doc/portupgrade/README
 %%PORTDOCS%%@dirrm share/doc/portupgrade