diff --git a/shells/ohmyzsh/Makefile b/shells/ohmyzsh/Makefile
index ee6b863d26a45..835f9687e4d0a 100644
--- a/shells/ohmyzsh/Makefile
+++ b/shells/ohmyzsh/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ohmyzsh
-PORTVERSION=	20221209
+PORTVERSION=	20230913
 CATEGORIES=	shells
 
 MAINTAINER=	skozlov@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	zsh:shells/zsh
 
 USE_GITHUB=	yes
-GH_TAGNAME=	f4dc8c5be365668810783ced01a86ff8f251bfd7
+GH_TAGNAME=	bbda81fe4b338f00bbf7c7f33e6d1b12d067dc05
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/shells/ohmyzsh/distinfo b/shells/ohmyzsh/distinfo
index ebaf42443d326..adda2964db6e7 100644
--- a/shells/ohmyzsh/distinfo
+++ b/shells/ohmyzsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670542469
-SHA256 (ohmyzsh-ohmyzsh-20221209-f4dc8c5be365668810783ced01a86ff8f251bfd7_GH0.tar.gz) = 9f61b8211f79f10d571ca2be5119ec87c98b9defc1662f8b6400ed810ea7c02f
-SIZE (ohmyzsh-ohmyzsh-20221209-f4dc8c5be365668810783ced01a86ff8f251bfd7_GH0.tar.gz) = 970502
+TIMESTAMP = 1694873425
+SHA256 (ohmyzsh-ohmyzsh-20230913-bbda81fe4b338f00bbf7c7f33e6d1b12d067dc05_GH0.tar.gz) = 5d21b291465e59a79467aab77565aedfe436fb04ce826e306066827c663dcdfa
+SIZE (ohmyzsh-ohmyzsh-20230913-bbda81fe4b338f00bbf7c7f33e6d1b12d067dc05_GH0.tar.gz) = 1937743
diff --git a/shells/ohmyzsh/files/patch-oh-my-zsh.sh b/shells/ohmyzsh/files/patch-oh-my-zsh.sh
index 9adac4be6147c..37fb56a17be3c 100644
--- a/shells/ohmyzsh/files/patch-oh-my-zsh.sh
+++ b/shells/ohmyzsh/files/patch-oh-my-zsh.sh
@@ -1,14 +1,11 @@
-Disable auto update
---- oh-my-zsh.sh.orig	2022-01-28 23:08:18 UTC
+--- oh-my-zsh.sh.orig	2023-09-16 14:01:58 UTC
 +++ oh-my-zsh.sh
-@@ -56,11 +56,6 @@ fi
+@@ -65,9 +65,6 @@ mkdir -p "$ZSH_CACHE_DIR/completions"
  mkdir -p "$ZSH_CACHE_DIR/completions"
  (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
  
 -# Check for updates on initial load...
--if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
--  source "$ZSH/tools/check_for_upgrade.sh"
--fi
+-source "$ZSH/tools/check_for_upgrade.sh"
 -
  # Initializes Oh My Zsh
  
diff --git a/shells/ohmyzsh/pkg-plist b/shells/ohmyzsh/pkg-plist
index 9f8625f4ef82d..fbf99eaafa2c6 100644
--- a/shells/ohmyzsh/pkg-plist
+++ b/shells/ohmyzsh/pkg-plist
@@ -35,8 +35,13 @@
 %%DATADIR%%/plugins/adb/_adb
 %%DATADIR%%/plugins/ag/README.md
 %%DATADIR%%/plugins/ag/_ag
+%%DATADIR%%/plugins/alias-finder/.zunit.yml
 %%DATADIR%%/plugins/alias-finder/README.md
 %%DATADIR%%/plugins/alias-finder/alias-finder.plugin.zsh
+%%DATADIR%%/plugins/alias-finder/tests/_output/.gitkeep
+%%DATADIR%%/plugins/alias-finder/tests/_support/.gitkeep
+%%DATADIR%%/plugins/alias-finder/tests/_support/bootstrap
+%%DATADIR%%/plugins/alias-finder/tests/test_run.sh
 %%DATADIR%%/plugins/aliases/.gitignore
 %%DATADIR%%/plugins/aliases/README.md
 %%DATADIR%%/plugins/aliases/aliases.plugin.zsh
@@ -53,6 +58,8 @@
 %%DATADIR%%/plugins/arcanist/arcanist.plugin.zsh
 %%DATADIR%%/plugins/archlinux/README.md
 %%DATADIR%%/plugins/archlinux/archlinux.plugin.zsh
+%%DATADIR%%/plugins/argocd/README.md
+%%DATADIR%%/plugins/argocd/argocd.plugin.zsh
 %%DATADIR%%/plugins/asdf/README.md
 %%DATADIR%%/plugins/asdf/asdf.plugin.zsh
 %%DATADIR%%/plugins/autoenv/README.md
@@ -63,6 +70,8 @@
 %%DATADIR%%/plugins/autopep8/_autopep8
 %%DATADIR%%/plugins/aws/README.md
 %%DATADIR%%/plugins/aws/aws.plugin.zsh
+%%DATADIR%%/plugins/azure/README.md
+%%DATADIR%%/plugins/azure/azure.plugin.zsh
 %%DATADIR%%/plugins/battery/README.md
 %%DATADIR%%/plugins/battery/battery.plugin.zsh
 %%DATADIR%%/plugins/bazel/README.md
@@ -80,6 +89,10 @@
 %%DATADIR%%/plugins/branch/branch.plugin.zsh
 %%DATADIR%%/plugins/brew/README.md
 %%DATADIR%%/plugins/brew/brew.plugin.zsh
+%%DATADIR%%/plugins/bridgetown/README.md
+%%DATADIR%%/plugins/bridgetown/bridgetown.plugin.zsh
+%%DATADIR%%/plugins/bun/README.md
+%%DATADIR%%/plugins/bun/bun.plugin.zsh
 %%DATADIR%%/plugins/bundler/README.md
 %%DATADIR%%/plugins/bundler/_bundler
 %%DATADIR%%/plugins/bundler/bundler.plugin.zsh
@@ -144,6 +157,8 @@
 %%DATADIR%%/plugins/cpanm/_cpanm
 %%DATADIR%%/plugins/dash/README.md
 %%DATADIR%%/plugins/dash/dash.plugin.zsh
+%%DATADIR%%/plugins/dbt/README.md
+%%DATADIR%%/plugins/dbt/dbt.plugin.zsh
 %%DATADIR%%/plugins/debian/README.md
 %%DATADIR%%/plugins/debian/debian.plugin.zsh
 %%DATADIR%%/plugins/deno/README.md
@@ -167,7 +182,7 @@
 %%DATADIR%%/plugins/docker-machine/_docker-machine
 %%DATADIR%%/plugins/docker-machine/docker-machine.plugin.zsh
 %%DATADIR%%/plugins/docker/README.md
-%%DATADIR%%/plugins/docker/_docker
+%%DATADIR%%/plugins/docker/completions/_docker
 %%DATADIR%%/plugins/docker/docker.plugin.zsh
 %%DATADIR%%/plugins/doctl/README.md
 %%DATADIR%%/plugins/doctl/doctl.plugin.zsh
@@ -263,6 +278,8 @@
 %%DATADIR%%/plugins/gh/gh.plugin.zsh
 %%DATADIR%%/plugins/git-auto-fetch/README.md
 %%DATADIR%%/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+%%DATADIR%%/plugins/git-commit/README.md
+%%DATADIR%%/plugins/git-commit/git-commit.plugin.zsh
 %%DATADIR%%/plugins/git-escape-magic/README.md
 %%DATADIR%%/plugins/git-escape-magic/git-escape-magic
 %%DATADIR%%/plugins/git-escape-magic/git-escape-magic.plugin.zsh
@@ -324,6 +341,8 @@
 %%DATADIR%%/plugins/hasura/hasura.plugin.zsh
 %%DATADIR%%/plugins/helm/README.md
 %%DATADIR%%/plugins/helm/helm.plugin.zsh
+%%DATADIR%%/plugins/heroku-alias/README.md
+%%DATADIR%%/plugins/heroku-alias/heroku.alias.sh
 %%DATADIR%%/plugins/heroku/README.md
 %%DATADIR%%/plugins/heroku/heroku.plugin.zsh
 %%DATADIR%%/plugins/history-substring-search/README.md
@@ -355,6 +374,8 @@
 %%DATADIR%%/plugins/istioctl/istioctl.plugin.zsh
 %%DATADIR%%/plugins/iterm2/README.md
 %%DATADIR%%/plugins/iterm2/iterm2.plugin.zsh
+%%DATADIR%%/plugins/iterm2/iterm2_shell_integration.zsh
+%%DATADIR%%/plugins/iterm2/update
 %%DATADIR%%/plugins/jake-node/README.md
 %%DATADIR%%/plugins/jake-node/jake-node.plugin.zsh
 %%DATADIR%%/plugins/jenv/README.md
@@ -432,6 +453,8 @@
 %%DATADIR%%/plugins/man/man.plugin.zsh
 %%DATADIR%%/plugins/marked2/README.md
 %%DATADIR%%/plugins/marked2/marked2.plugin.zsh
+%%DATADIR%%/plugins/marktext/README.md
+%%DATADIR%%/plugins/marktext/marktext.plugin.zsh
 %%DATADIR%%/plugins/mercurial/README.md
 %%DATADIR%%/plugins/mercurial/mercurial.plugin.zsh
 %%DATADIR%%/plugins/meteor/README.md
@@ -463,12 +486,16 @@
 %%DATADIR%%/plugins/nanoc/README.md
 %%DATADIR%%/plugins/nanoc/_nanoc
 %%DATADIR%%/plugins/nanoc/nanoc.plugin.zsh
+%%DATADIR%%/plugins/nats/README.md
+%%DATADIR%%/plugins/nats/nats.plugin.zsh
 %%DATADIR%%/plugins/ng/README.md
 %%DATADIR%%/plugins/ng/_ng
 %%DATADIR%%/plugins/nmap/README.md
 %%DATADIR%%/plugins/nmap/nmap.plugin.zsh
 %%DATADIR%%/plugins/node/README.md
 %%DATADIR%%/plugins/node/node.plugin.zsh
+%%DATADIR%%/plugins/nodenv/README.md
+%%DATADIR%%/plugins/nodenv/nodenv.plugin.zsh
 %%DATADIR%%/plugins/nomad/README.md
 %%DATADIR%%/plugins/nomad/_nomad
 %%DATADIR%%/plugins/npm/README.md
@@ -515,6 +542,8 @@
 %%DATADIR%%/plugins/pm2/pm2.plugin.zsh
 %%DATADIR%%/plugins/pod/README.md
 %%DATADIR%%/plugins/pod/_pod
+%%DATADIR%%/plugins/podman/README.md
+%%DATADIR%%/plugins/podman/podman.plugin.zsh
 %%DATADIR%%/plugins/poetry/README.md
 %%DATADIR%%/plugins/poetry/poetry.plugin.zsh
 %%DATADIR%%/plugins/postgres/README.md
@@ -536,6 +565,10 @@
 %%DATADIR%%/plugins/pylint/pylint.plugin.zsh
 %%DATADIR%%/plugins/python/README.md
 %%DATADIR%%/plugins/python/python.plugin.zsh
+%%DATADIR%%/plugins/qodana/README.md
+%%DATADIR%%/plugins/qodana/qodana.plugin.zsh
+%%DATADIR%%/plugins/qrcode/README.md
+%%DATADIR%%/plugins/qrcode/qrcode.plugin.zsh
 %%DATADIR%%/plugins/rails/README.md
 %%DATADIR%%/plugins/rails/_rails
 %%DATADIR%%/plugins/rails/rails.plugin.zsh
@@ -621,6 +654,8 @@
 %%DATADIR%%/plugins/ssh-agent/ssh-agent.plugin.zsh
 %%DATADIR%%/plugins/stack/README.md
 %%DATADIR%%/plugins/stack/stack.plugin.zsh
+%%DATADIR%%/plugins/starship/README.md
+%%DATADIR%%/plugins/starship/starship.plugin.zsh
 %%DATADIR%%/plugins/sublime-merge/README.md
 %%DATADIR%%/plugins/sublime-merge/sublime-merge.plugin.zsh
 %%DATADIR%%/plugins/sublime/README.md
@@ -653,11 +688,12 @@
 %%DATADIR%%/plugins/taskwarrior/README.md
 %%DATADIR%%/plugins/taskwarrior/_task
 %%DATADIR%%/plugins/taskwarrior/taskwarrior.plugin.zsh
-%%DATADIR%%/plugins/term_tab/README
+%%DATADIR%%/plugins/term_tab/README.md
 %%DATADIR%%/plugins/term_tab/term_tab.plugin.zsh
 %%DATADIR%%/plugins/terminitor/README.md
 %%DATADIR%%/plugins/terminitor/_terminitor
 %%DATADIR%%/plugins/terraform/README.md
+%%DATADIR%%/plugins/terraform/_terraform
 %%DATADIR%%/plugins/terraform/terraform.plugin.zsh
 %%DATADIR%%/plugins/textastic/README.md
 %%DATADIR%%/plugins/textastic/textastic.plugin.zsh
@@ -723,6 +759,8 @@
 %%DATADIR%%/plugins/wakeonlan/README.md
 %%DATADIR%%/plugins/wakeonlan/_wake
 %%DATADIR%%/plugins/wakeonlan/wakeonlan.plugin.zsh
+%%DATADIR%%/plugins/watson/README.md
+%%DATADIR%%/plugins/watson/_watson
 %%DATADIR%%/plugins/wd/LICENSE
 %%DATADIR%%/plugins/wd/README.md
 %%DATADIR%%/plugins/wd/_wd.sh
@@ -748,6 +786,8 @@
 %%DATADIR%%/plugins/z/MANUAL.md
 %%DATADIR%%/plugins/z/README.md
 %%DATADIR%%/plugins/z/_z
+%%DATADIR%%/plugins/z/img/mit_license.svg
+%%DATADIR%%/plugins/z/img/zsh_4.3.11_plus.svg
 %%DATADIR%%/plugins/z/z.plugin.zsh
 %%DATADIR%%/plugins/zbell/README.md
 %%DATADIR%%/plugins/zbell/zbell.plugin.zsh
@@ -756,7 +796,9 @@
 %%DATADIR%%/plugins/zeus/zeus.plugin.zsh
 %%DATADIR%%/plugins/zoxide/README.md
 %%DATADIR%%/plugins/zoxide/zoxide.plugin.zsh
+%%DATADIR%%/plugins/zsh-interactive-cd/LICENSE
 %%DATADIR%%/plugins/zsh-interactive-cd/README.md
+%%DATADIR%%/plugins/zsh-interactive-cd/demo.gif
 %%DATADIR%%/plugins/zsh-interactive-cd/zsh-interactive-cd.plugin.zsh
 %%DATADIR%%/plugins/zsh-navigation-tools/.config/znt/n-aliases.conf
 %%DATADIR%%/plugins/zsh-navigation-tools/.config/znt/n-cd.conf
@@ -894,6 +936,7 @@
 %%DATADIR%%/themes/nicoulaj.zsh-theme
 %%DATADIR%%/themes/norm.zsh-theme
 %%DATADIR%%/themes/obraun.zsh-theme
+%%DATADIR%%/themes/oldgallois.zsh-theme
 %%DATADIR%%/themes/peepcode.zsh-theme
 %%DATADIR%%/themes/philips.zsh-theme
 %%DATADIR%%/themes/pmcgee.zsh-theme