diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4d3657fd64..52fdb59a79 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ Run this command each time a [sample][samples] has been modified.
 
 To run Linguist from the cloned repository:
 
-    bundle exec bin/linguist --breakdown
+    bundle exec bin/github-linguist --breakdown
 
 ### Dependencies
 
diff --git a/README.md b/README.md
index fbf0b06af5..d79c278142 100644
--- a/README.md
+++ b/README.md
@@ -75,13 +75,13 @@ A repository's languages stats can also be assessed from the command line using
 
 ```console
 $ cd /path-to-repository/
-$ linguist
+$ github-linguist
 ```
 
 You can try running `linguist` on the root directory in this repository itself:
 
 ```console
-$ bundle exec bin/linguist --breakdown
+$ bundle exec bin/github-linguist --breakdown
 68.57%  Ruby
 22.90%  C
 6.93%   Go
@@ -92,7 +92,7 @@ Ruby:
 Gemfile
 Rakefile
 bin/git-linguist
-bin/linguist
+bin/github-linguist
 ext/linguist/extconf.rb
 github-linguist.gemspec
 lib/linguist.rb
diff --git a/bin/linguist b/bin/github-linguist
similarity index 100%
rename from bin/linguist
rename to bin/github-linguist
diff --git a/github-linguist.gemspec b/github-linguist.gemspec
index 809927c9fa..9a41df2584 100644
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license  = "MIT"
 
   s.files = Dir['lib/**/*'] + Dir['ext/**/*'] + Dir['grammars/*'] + ['LICENSE']
-  s.executables = ['linguist', 'git-linguist']
+  s.executables = ['github-linguist', 'git-linguist']
   s.extensions = ['ext/linguist/extconf.rb']
 
   s.add_dependency 'charlock_holmes', '~> 0.7.6'
diff --git a/test/test_repository.rb b/test/test_repository.rb
index fa73ae1be9..6f137c9ca0 100644
--- a/test/test_repository.rb
+++ b/test/test_repository.rb
@@ -6,7 +6,7 @@ def rugged_repository
   end
 
   def master_oid
-    'd40b4a33deba710e2f494db357c654fbe5d4b419'
+    '2a6dd02c6e81b7e30d978806d43d4ba1a7ba8003'
   end
 
   def linguist_repo(oid = master_oid)
@@ -27,7 +27,7 @@ def test_linguist_size
 
   def test_linguist_breakdown
     assert linguist_repo.breakdown_by_file.has_key?("Ruby")
-    assert linguist_repo.breakdown_by_file["Ruby"].include?("bin/linguist")
+    assert linguist_repo.breakdown_by_file["Ruby"].include?("bin/github-linguist")
     assert linguist_repo.breakdown_by_file["Ruby"].include?("lib/linguist/language.rb")
   end