diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 270ad593..6c87f10a 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -33,6 +33,9 @@
 # Erlang bundles
 - ^rebar$
 
+# Go dependencies
+- Godeps/_workspace/
+
 # Bootstrap minified css and js
 - (^|/)bootstrap([^.]*)(\.min)?\.(js|css)$
 
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 968abf09..47c6574c 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -279,6 +279,10 @@ class TestBlob < Test::Unit::TestCase
     assert blob("app/bower_components/custom/custom.js").vendored?
     assert blob("vendor/assets/bower_components/custom/custom.js").vendored?
 
+    # Go dependencies
+    assert !blob("Godeps/Godeps.json").vendored?
+    assert blob("Godeps/_workspace/src/github.com/kr/s3/sign.go").vendored?
+
     # Rails vendor/
     assert blob("vendor/plugins/will_paginate/lib/will_paginate.rb").vendored?