diff --git a/zsh.changes b/zsh.changes
index f772e2c..fcdc33e 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  3 16:12:24 UTC 2025 - Paolo Perego <paolo.perego@suse.com>
+
+- Fix bsc#1226450. Placing skip_global_compinit=1 in your $ZDOTDIR/.zshenv
+  disables compinit from being called
+
 -------------------------------------------------------------------
 Mon Mar  3 15:52:59 UTC 2025 - Paolo Perego <paolo.perego@suse.com>
 
diff --git a/zshrc b/zshrc
index 0034c91..c582f97 100644
--- a/zshrc
+++ b/zshrc
@@ -63,8 +63,13 @@ unsetopt hup
 # Comment the two below lines out, if you are on a slow machine, and
 # comment the above compctl lines in.
 
-autoload -U compinit
-compinit
+# If you don't want compinit called here, place the line
+# skip_global_compinit=1
+# in your $ZDOTDIR/.zshenv
+if [[ -z "$skip_global_compinit" ]]; then
+	autoload -U compinit
+	compinit
+fi
 
 # Completion so "cd ..<TAB>" -> "cd ../"
 # zstyle ':completion:*' special-dirs ..