diff --git a/source/ehcache.xml b/source/ehcache.xml
index 48ac5abf..3553c5ed 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -23,8 +23,8 @@
 	Short-lived (48 hours) persistent cache for web responses.
 	-->
 	<cache name="web-datasource"
-		maxElementsInMemory="120"
-		maxElementsOnDisk="1200"
+		maxElementsInMemory="200"
+		maxElementsOnDisk="5000"
 		eternal="false"
 		timeToIdleSeconds="172800"
 		timeToLiveSeconds="172800"
diff --git a/source/net/sourceforge/filebot/Settings.properties b/source/net/sourceforge/filebot/Settings.properties
index d92719fa..aad30ad9 100644
--- a/source/net/sourceforge/filebot/Settings.properties
+++ b/source/net/sourceforge/filebot/Settings.properties
@@ -18,3 +18,4 @@ thetvdb.apikey: 58B4AA94C59AD656
 themoviedb.apikey: 5a6edae568130bf10617b6d45be99f13
 serienjunkies.apikey: 9fbhw9uebfiwvbefzuwv
 fanart.tv.apikey: 780b986b22c35e6f7a134a2f392c2deb
+acoustid.apikey: 0B3qZnQc
diff --git a/source/net/sourceforge/filebot/WebServices.java b/source/net/sourceforge/filebot/WebServices.java
index 165eb529..05a48b62 100644
--- a/source/net/sourceforge/filebot/WebServices.java
+++ b/source/net/sourceforge/filebot/WebServices.java
@@ -20,6 +20,7 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.sourceforge.filebot.audio.AcoustID;
 import net.sourceforge.filebot.media.MediaDetection;
 import net.sourceforge.filebot.web.AnidbClient;
 import net.sourceforge.filebot.web.EpisodeListProvider;
@@ -61,8 +62,9 @@ public final class WebServices {
 	public static final SubsceneSubtitleClient Subscene = new SubsceneSubtitleClient();
 	public static final SublightSubtitleClient Sublight = new SublightSubtitleClient();
 	
-	// fanart.tv
+	// misc
 	public static final FanartTV FanartTV = new FanartTV(Settings.getApplicationProperty("fanart.tv.apikey"));
+	public static final AcoustID AcoustID = new AcoustID(Settings.getApplicationProperty("acoustid.apikey"));
 	
 	
 	public static EpisodeListProvider[] getEpisodeListProviders() {
diff --git a/source/net/sourceforge/filebot/resources/search.acoustid.png b/source/net/sourceforge/filebot/resources/search.acoustid.png
new file mode 100644
index 00000000..d8916ceb
Binary files /dev/null and b/source/net/sourceforge/filebot/resources/search.acoustid.png differ
diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
index 98ed6d38..b05fb137 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
@@ -256,6 +256,10 @@ public class RenamePanel extends JComponent {
 			actionPopup.add(new AutoCompleteAction(it.getName(), it.getIcon(), new MovieHashMatcher(it)));
 		}
 		
+		actionPopup.addSeparator();
+		actionPopup.addDescription(new JLabel("Music Mode:"));
+		actionPopup.add(new AutoCompleteAction("AcoustID", ResourceManager.getIcon("search.acoustid"), new AudioFingerprintMatcher(WebServices.AcoustID)));
+		
 		actionPopup.addSeparator();
 		actionPopup.addDescription(new JLabel("Options:"));