diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp
index 5ecb1403a..d2ec295a4 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.cpp
+++ b/src/libtomahawk/filemetadata/MusicScanner.cpp
@@ -147,6 +147,7 @@ MusicScanner::MusicScanner( MusicScanner::ScanMode scanMode, const QStringList&
     m_ext2mime.insert( "flac", TomahawkUtils::extensionToMimetype( "flac" ) );
     m_ext2mime.insert( "aiff", TomahawkUtils::extensionToMimetype( "aiff" ) );
     m_ext2mime.insert( "aif",  TomahawkUtils::extensionToMimetype( "aif" ) );
+    m_ext2mime.insert( "wv",   TomahawkUtils::extensionToMimetype( "wv" ) );
 }
 
 
diff --git a/src/libtomahawk/filemetadata/taghandlers/tag.cpp b/src/libtomahawk/filemetadata/taghandlers/tag.cpp
index 6084900f6..dd6509611 100644
--- a/src/libtomahawk/filemetadata/taghandlers/tag.cpp
+++ b/src/libtomahawk/filemetadata/taghandlers/tag.cpp
@@ -35,6 +35,7 @@
 #include <taglib/mpcfile.h>
 #include <taglib/asffile.h>
 #include <taglib/aifffile.h>
+#include <taglib/wavpackfile.h>
 
 #include <QStringList>
 
@@ -109,7 +110,14 @@ namespace Tomahawk
         if( file->tag() )
             t = new ASFTag( f.tag(), file->tag() );
     }
-
+    else if( TagLib::WavPack::File *file =
+        dynamic_cast< TagLib::WavPack::File * >( f.file() ) )
+    {
+        if( file->APETag() )
+            t = new APETag( f.tag(), file->APETag() );
+        else if( file->ID3v1Tag() )
+            t = new ID3v1Tag( f.tag() );
+    }
 
     return t;
 }
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 208692efe..bc72b10b8 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -326,6 +326,7 @@ extensionToMimetype( const QString& extension )
         s_ext2mime.insert( "flac", "audio/flac" );
         s_ext2mime.insert( "aiff", "audio/aiff" );
         s_ext2mime.insert( "aif",  "audio/aiff" );
+        s_ext2mime.insert( "wv",   "audio/x-wavpack" );
     }
 
     return s_ext2mime.value( extension, "unknown" );