5 files changed, 32 insertions, 2 deletions
diff --git a/Functions/Zle/.distfiles b/Functions/Zle/.distfiles
index b17029a7e..7de26ec71 100644
--- a/Functions/Zle/.distfiles
+++ b/Functions/Zle/.distfiles
@@ -1,5 +1,7 @@
 DISTFILES_SRC='
 .distfiles
+bash-backward-kill-word     bash-backward-word
+bash-kill-word              bash-forward-word
 cycle-completion-positions  incarg                      predict-on
 edit-command-line           incremental-complete-word   smart-insert-last-word
 history-search-end          insert-files
diff --git a/Functions/Zle/bash-backward-kill-word b/Functions/Zle/bash-backward-kill-word
index a85c9ba3e..6c4f3ba18 100644
--- a/Functions/Zle/bash-backward-kill-word
+++ b/Functions/Zle/bash-backward-kill-word
@@ -1,8 +1,9 @@
-# function bash-backward-kill-word {
 # This implements a bash-style backward-kill-word.
 # To use,
 #   zle -N bash-backward-kill-word
 #   bindkey '...' bash-backward-kill-word
+# or if you wish to replace existing backward-kill-word bindings,
+#   zle -N backward-kill-word bash-backward-kill-word
+
 local WORDCHARS=''
 zle .backward-kill-word
-# }
diff --git a/Functions/Zle/bash-backward-word b/Functions/Zle/bash-backward-word
new file mode 100644
index 000000000..23da8b3fe
--- /dev/null
+++ b/Functions/Zle/bash-backward-word
@@ -0,0 +1,9 @@
+# This implements a bash-style backward-word.
+# To use,
+#   zle -N bash-backward-word
+#   bindkey '...' bash-backward-word
+# or if you wish to replace existing backward-word bindings,
+#   zle -N backward-word bash-backward-word
+
+local WORDCHARS=''
+zle .backward-word
diff --git a/Functions/Zle/bash-forward-word b/Functions/Zle/bash-forward-word
new file mode 100644
index 000000000..963ea012a
--- /dev/null
+++ b/Functions/Zle/bash-forward-word
@@ -0,0 +1,9 @@
+# This implements a bash-style forward-word.
+# To use,
+#   zle -N bash-forward-word
+#   bindkey '...' bash-forward-word
+# or if you wish to replace existing forward-word bindings,
+#   zle -N forward-word bash-forward-word
+
+local WORDCHARS=''
+zle .forward-word
diff --git a/Functions/Zle/bash-kill-word b/Functions/Zle/bash-kill-word
new file mode 100644
index 000000000..ba638a3c7
--- /dev/null
+++ b/Functions/Zle/bash-kill-word
@@ -0,0 +1,9 @@
+# This implements a bash-style kill-word.
+# To use,
+#   zle -N bash-kill-word
+#   bindkey '...' bash-kill-word
+# or if you wish to replace existing kill-word bindings,
+#   zle -N kill-word bash-kill-word
+
+local WORDCHARS=''
+zle .kill-word