diff --git a/.config/zsh/plugins/zsh-autosuggestions b/.config/zsh/plugins/zsh-autosuggestions
index ae315de..0d07421 160000
--- a/.config/zsh/plugins/zsh-autosuggestions
+++ b/.config/zsh/plugins/zsh-autosuggestions
@@ -1 +1 @@
-Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d
+Subproject commit 0d07421b4267b9a849c38e7a2a93c015946965e3
diff --git a/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config b/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config
index 802eb84..7f70320 100644
--- a/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config
+++ b/.config/zsh/zshrc.d/90-external-plugins/20-autosuggestions-config
@@ -7,4 +7,7 @@
 #     Chooses a suggestion based on what tab-completion would suggest.
 ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd completion)
 
+ZSH_AUTOSUGGEST_MATCH_NUM_PREV_CMDS=2
+ZSH_AUTOSUGGEST_MATCH_PREV_MAX_CMDS=-1
+
 # vim: ft=zsh
diff --git a/.gitmodules b/.gitmodules
index abfc009..bddaefd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -74,7 +74,7 @@
 	url = https://github.com/sickill/stderred
 [submodule "zsh-autosuggestions"]
 	path = .config/zsh/plugins/zsh-autosuggestions
-	url = https://github.com/zsh-users/zsh-autosuggestions
+	url = https://github.com/druckdev/zsh-autosuggestions
 [submodule "zsh-syntax-highlighting"]
 	path = .config/zsh/plugins/zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting