diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp
index 032ddac79..490d7b3fd 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.cpp
+++ b/src/libtomahawk/filemetadata/MusicScanner.cpp
@@ -213,10 +213,7 @@ MusicScanner::startScan()
     m_scanned = m_skipped = m_cmdQueue = 0;
     m_skippedFiles.clear();
 
-    if ( m_showProgress )
-    {
-        SourceList::instance()->getLocal()->scanningProgress( m_scanned );
-    }
+    emit progress( m_scanned );
 
     // trigger the scan once we've loaded old filemtimes
     //FIXME: For multiple collection support make sure the right prefix gets passed in...or not...
@@ -467,8 +464,9 @@ MusicScanner::readFile( const QFileInfo& fi )
     const QVariant m = readTags( fi );
 
     if ( m_scanned )
-        if ( m_scanned % 3 == 0 && m_showProgress )
-            SourceList::instance()->getLocal()->scanningProgress( m_scanned );
+        if ( m_scanned % 3 == 0 )
+            emit progress( m_scanned );
+
     if ( m_scanned % 100 == 0 || m_verbose )
       tDebug( LOGINFO ) << "Scanning file:" << m_scanned << fi.canonicalFilePath();
 
diff --git a/src/libtomahawk/filemetadata/MusicScanner.h b/src/libtomahawk/filemetadata/MusicScanner.h
index a3739a9a4..6dcd6039a 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.h
+++ b/src/libtomahawk/filemetadata/MusicScanner.h
@@ -130,6 +130,7 @@ signals:
     //void fileScanned( QVariantMap );
     void finished();
     void batchReady( const QVariantList&, const QVariantList& );
+    void progress( unsigned int files );
 
 private:
     QVariant readFile( const QFileInfo& fi );
diff --git a/src/libtomahawk/filemetadata/ScanManager.cpp b/src/libtomahawk/filemetadata/ScanManager.cpp
index 2163de142..30ef4c933 100644
--- a/src/libtomahawk/filemetadata/ScanManager.cpp
+++ b/src/libtomahawk/filemetadata/ScanManager.cpp
@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2014, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -56,6 +56,7 @@ MusicScannerThreadController::run()
 {
     m_musicScanner = QPointer< MusicScanner >( new MusicScanner( m_mode, m_paths, m_bs ) );
     connect( m_musicScanner.data(), SIGNAL( finished() ), parent(), SLOT( scannerFinished() ), Qt::QueuedConnection );
+    connect( m_musicScanner.data(), SIGNAL( progress( unsigned int ) ), parent(), SIGNAL( progress( unsigned int ) ), Qt::QueuedConnection );
     QMetaObject::invokeMethod( m_musicScanner.data(), "startScan", Qt::QueuedConnection );
 
     exec();
diff --git a/src/libtomahawk/filemetadata/ScanManager.h b/src/libtomahawk/filemetadata/ScanManager.h
index fbae62b25..941d31e4e 100644
--- a/src/libtomahawk/filemetadata/ScanManager.h
+++ b/src/libtomahawk/filemetadata/ScanManager.h
@@ -52,7 +52,7 @@ private:
     QPointer< MusicScanner > m_musicScanner;
     MusicScanner::ScanMode m_mode;
     QStringList m_paths;
-    quint32 m_bs; 
+    quint32 m_bs;
 };
 
 
@@ -67,6 +67,8 @@ public:
     virtual ~ScanManager();
 
 signals:
+    void started();
+    void progress( unsigned int files );
     void finished();
 
 public slots: