diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 0d0b8338..de3097eb 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -165,5 +165,13 @@ module Linguist
         Language["text"]
       end
     end
+
+    disambiguate "BitBake", "BlitzBasic" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
+    end
   end
 end
diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb
index 4b208770..7f487ecf 100644
--- a/test/test_heuristics.rb
+++ b/test/test_heuristics.rb
@@ -126,6 +126,13 @@ class TestHeuristcs < Test::Unit::TestCase
     })
   end
 
+  def test_bb_by_heuristics
+    assert_heuristics({
+      "BitBake" => all_fixtures("BitBake"),
+      "BlitzBasic" => all_fixtures("BlitzBasic")
+    })
+  end
+
   def assert_heuristics(hash)
     candidates = hash.keys.map { |l| Language[l] }