diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index 3400f27..85d2488 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -358,7 +358,8 @@ bool CMusicInfoScanner::DoScan(const CStdString& strDirectory)
   // sort and get the path hash.  Note that we don't filter .cue sheet items here as we want
   // to detect changes in the .cue sheet as well.  The .cue sheet items only need filtering
   // if we have a changed hash.
-  items.Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
+  //items.Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
+  items.Sort(SORT_METHOD_DATE, SORT_ORDER_ASC);
   CStdString hash;
   GetPathHash(items, hash);

@@ -376,8 +377,9 @@ bool CMusicInfoScanner::DoScan(const CStdString& strDirectory)

     // filter items in the sub dir (for .cue sheet support)
     items.FilterCueItems();
-    items.Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
-
+    //items.Sort(SORT_METHOD_LABEL, SORT_ORDER_ASC);
+    items.Sort(SORT_METHOD_DATE, SORT_ORDER_ASC);
+
     // and then scan in the new information
     if (RetrieveMusicInfo(items, strDirectory) > 0)
     {
diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp
index 0dfbbef..213b569 100644
--- a/xbmc/video/VideoInfoScanner.cpp
+++ b/xbmc/video/VideoInfoScanner.cpp
@@ -290,6 +290,8 @@ namespace VIDEO

     if (!bSkip)
     {
+      // make sure we scan info according to the file creation date so it mirrors the source directory
+      items.Sort(SORT_METHOD_DATE,SORT_ORDER_ASC);
       if (RetrieveVideoInfo(items, settings.parent_name_root, content))
       {
         if (!m_bStop && (content == CONTENT_MOVIES || content == CONTENT_MUSICVIDEOS))