diff --git a/Changelog b/Changelog
index ee292adef..2e2ade31c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.8
   - BUFIX: Fix compilation with libtorrent v0.14.x
+  - BUGFIX: Fix issues when writing on NTFS (Linux, Mac)
+  - BUGFIX: Fix root folder being cut off if the torrent comes from a scanned folder (Christian Kandeler)
 
 * Sat Feb 26 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.7
   - BUGFIX: Encoding fixes (Windows)
diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index a5ae28c92..d6d26e095 100644
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -2414,12 +2414,12 @@ QString QBtSession::getSavePath(QString hash, bool fromScanDir, QString filePath
     qDebug("SavePath got from persistant data is %s", qPrintable(savePath));
     bool append_root_folder = false;
     if(savePath.isEmpty()) {
-      if(fromScanDir && m_scanFolders->downloadInTorrentFolder(filePath))
+      if(fromScanDir && m_scanFolders->downloadInTorrentFolder(filePath)) {
         savePath = QFileInfo(filePath).dir().path();
-      else {
+      } else {
         savePath = defaultSavePath;
-        append_root_folder = true;
       }
+      append_root_folder = true;
     }
     if(!fromScanDir && appendLabelToSavePath) {
       const QString label = TorrentPersistentData::getLabel(hash);