diff --git a/doc/UltiSnips.txt b/doc/UltiSnips.txt
index 6f3b4ca..d43ecce 100644
--- a/doc/UltiSnips.txt
+++ b/doc/UltiSnips.txt
@@ -1407,6 +1407,7 @@ individuals have contributed to UltiSnips (in chronological order):
    Mathias Fußenegger - mfussenegger
    Kevin Ballard - kballard
    Ahbong Chang - cwahbong
+   Glenn Griffin - ggriffiniii
 
 
 Thank you for your support.
diff --git a/test/test_Fixes.py b/test/test_Fixes.py
index fabd1aa..4c4ee80 100644
--- a/test/test_Fixes.py
+++ b/test/test_Fixes.py
@@ -30,4 +30,17 @@ class RetainsTheUnnamedRegister_ButOnlyOnce(_VimTest):
     wanted = "\nblah\nhello world "
 # End: Github Pull Request # 134 #}}}
 
+# Test to ensure that shiftwidth follows tabstop when it's set to zero post
+# version 7.3.693. Prior to that version a shiftwidth of zero effectively
+# removes tabs.
+class ShiftWidthZero(_VimTest):
+  def _extra_options_pre_init(self, vim_config):
+    vim_config += [
+        "if exists('*shiftwidth')",
+        "  set shiftwidth=0",
+        "endif",
+    ]
+  snippets = ("test", "\t${1}${0}")
+  keys = "test" + EX + "foo"
+  wanted = "\tfoo"