diff --git a/.gitignore b/.gitignore
index 5007c1b929..6a9880fa57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,15 @@ tags
 /Godeps/_workspace/bin
 
 # Go vendored libs
-# Match two levels deep so we can un-ignore specific repos, like below.
-/vendor/*/*/
-# Un-ignore gozk since it has local modifications.
-!/vendor/launchpad.net/gozk/
+# Ideally we would match two levels deep so we can un-ignore specific repos
+# like launchpad.net/gozk, but doing that triggers a bug in "git stash".
+# As a workaround, we ignore at the domain level.
+/vendor/*/
+# We really only want to un-ignore launchpad.net/gozk,
+# because it has local, tracked changes.
+# But we can't do that because of the bug mentioned above,
+# so we un-ignore all of launchpad.net.
+!/vendor/launchpad.net/
 
 # C build dirs
 **/build