diff --git a/data/data.qrc b/data/data.qrc
index 4d49d45c6..f7fff7c07 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -330,7 +330,6 @@
         <file>providers/22x22/cdbaby.png</file>
         <file>providers/22x22/digitallyimported.png</file>
         <file>providers/22x22/dropbox.png</file>
-        <file>providers/22x22/echonest.png</file>
         <file>providers/22x22/googledrive.png</file>
         <file>providers/22x22/itunes.png</file>
         <file>providers/22x22/jamendo.png</file>
@@ -363,7 +362,6 @@
         <file>providers/32x32/cdbaby.png</file>
         <file>providers/32x32/digitallyimported.png</file>
         <file>providers/32x32/dropbox.png</file>
-        <file>providers/32x32/echonest.png</file>
         <file>providers/32x32/googledrive.png</file>
         <file>providers/32x32/itunes.png</file>
         <file>providers/32x32/jamendo.png</file>
@@ -396,7 +394,6 @@
         <file>providers/48x48/cdbaby.png</file>
         <file>providers/48x48/digitallyimported.png</file>
         <file>providers/48x48/dropbox.png</file>
-        <file>providers/48x48/echonest.png</file>
         <file>providers/48x48/googledrive.png</file>
         <file>providers/48x48/itunes.png</file>
         <file>providers/48x48/jamendo.png</file>
diff --git a/data/providers/22x22/echonest.png b/data/providers/22x22/echonest.png
deleted file mode 100644
index d504dba28..000000000
Binary files a/data/providers/22x22/echonest.png and /dev/null differ
diff --git a/data/providers/32x32/echonest.png b/data/providers/32x32/echonest.png
deleted file mode 100644
index 278a7238f..000000000
Binary files a/data/providers/32x32/echonest.png and /dev/null differ
diff --git a/data/providers/48x48/echonest.png b/data/providers/48x48/echonest.png
deleted file mode 100644
index 602f2dc53..000000000
Binary files a/data/providers/48x48/echonest.png and /dev/null differ
diff --git a/debian/control b/debian/control
index d8900cce4..110af2215 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 7),
                libcdio-cdda1,
                libchromaprint-dev,
                libcrypto++-dev,
-               libechonest-dev,
                libglew1.5-dev |
                libglew-dev,
                libqt4-dev,
diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
index c055d1ace..9e4dcbdd9 100644
--- a/dist/clementine.spec.in
+++ b/dist/clementine.spec.in
@@ -14,8 +14,7 @@ BuildRequires:  qt4-devel boost-devel gcc-c++ glew-devel libgpod-devel
 BuildRequires:  cmake gstreamer1-devel gstreamer1-plugins-base-devel
 BuildRequires:  libmtp-devel protobuf-devel protobuf-compiler libcdio-devel
 BuildRequires:  qjson-devel cryptopp-devel fftw-devel sparsehash-devel
-BuildRequires:  sqlite-devel pulseaudio-libs-devel libechonest-devel
-BuildRequires:  libchromaprint-devel
+BuildRequires:  sqlite-devel pulseaudio-libs-devel libchromaprint-devel
 
 Requires:       libgpod protobuf-lite libcdio qjson sqlite
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index eed402835..591575fd2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,14 +33,13 @@ parts:
     # See 'snapcraft plugins'
     build-packages:
 
-       [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libechonest-dev,libchromaprint-dev,libqca2-dev]
+       [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libchromaprint-dev,libqca2-dev]
   
     stage-packages: 
       - libc6
       - libcdio13
       - libchromaprint0
       - libcrypto++9v5
-      - libechonest2.3
       - libfftw3-double3
       - libgcc1 
       - libgl1-mesa-glx