diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index 2078056a..ef872e24 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -28,7 +28,7 @@ module Sinatra
     end
 
     def accept?(type)
-      preferred_type.include?(type)
+      preferred_type(type).include?(type)
     end
 
     def preferred_type(*types)
diff --git a/test/request_test.rb b/test/request_test.rb
index 16cac39d..95257541 100644
--- a/test/request_test.rb
+++ b/test/request_test.rb
@@ -63,6 +63,11 @@ class RequestTest < Test::Unit::TestCase
     end
   end
 
+  it "accepts types when wildcards are requested" do
+    request = Sinatra::Request.new('HTTP_ACCEPT' => 'image/*')
+    assert request.accept?('image/jpeg')
+  end
+
   it "properly decodes MIME type parameters" do
     request = Sinatra::Request.new(
       'HTTP_ACCEPT' => 'image/jpeg;unquoted=0.25;quoted="0.25";chartest="\";,\x"'