diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index 7efae92c2..3f9cf2b7d 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -144,9 +144,9 @@ def match_album(artist, album, tracks=None, limit=SEARCH_LIMIT):
     optionally, a number of tracks on the album.
     """
     # Build search criteria.
-    criteria = {'release': album}
+    criteria = {'release': album.lower()}
     if artist is not None:
-        criteria['artist'] = artist
+        criteria['artist'] = artist.lower()
     else:
         # Various Artists search.
         criteria['arid'] = VARIOUS_ARTISTS_ID
@@ -168,8 +168,8 @@ def match_track(artist, title, limit=SEARCH_LIMIT):
     objects.
     """
     criteria = {
-        'artist': artist,
-        'recording': title,
+        'artist': artist.lower(),
+        'recording': title.lower(),
     }
 
     if not any(criteria.itervalues()):
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 631699ea8..97a8a44d7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -30,6 +30,8 @@ Changelog
 * Fix a divide-by-zero crash on zero-length audio files.
 * Fix a crash in the ``chroma`` plugin when the Acoustid database had no
   recording associated with a fingerprint.
+* Fix a crash when an autotagging with an artist or album containing "AND" or
+  "OR" (upper case).
 
 1.0b12 (January 16, 2012)
 -------------------------