diff --git a/Changelog b/Changelog
index ee2c3c211..78c87cc9a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
+    - BUGFIX: Announce to all trackers at once
+    - BUGFIX: Added support for single-thread boost
+
 * Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
     - BUGFIX: Fix crash when adding a new torrent label
     - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader
diff --git a/configure b/configure
index 274376dff..c1e4f4220 100755
--- a/configure
+++ b/configure
@@ -407,6 +407,16 @@ public:
       name = result.first().mid(3);
       // Remove .so
       name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
     }
     return name;
   }
diff --git a/qcm/libboost.qcm b/qcm/libboost.qcm
index b5573c9c7..418efe841 100644
--- a/qcm/libboost.qcm
+++ b/qcm/libboost.qcm
@@ -22,6 +22,16 @@ public:
       name = result.first().mid(3);
       // Remove .so
       name.chop(3);
+    } else {
+      // Fall back to non -mt boost lib
+      filters.clear();
+      filters << "libboost_"+lib+"*.so";
+      result = libDir.entryList(filters, QDir::Files);
+      if(!result.empty()) {
+        name = result.first().mid(3);
+        // Remove .so
+        name.chop(3);
+      }
     }
     return name;
   }
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 94ee1e9ca..d1aa97939 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -421,6 +421,7 @@ void Bittorrent::configureSession() {
   //sessionSettings.announce_to_all_trackers = true;
   sessionSettings.auto_scrape_interval = 1200; // 20 minutes
 #ifdef LIBTORRENT_0_15
+  sessionSettings.announce_to_all_trackers = true;
   sessionSettings.announce_to_all_tiers = true; //uTorrent behavior
   sessionSettings.auto_scrape_min_interval = 900; // 15 minutes
 #endif