diff --git a/Changelog b/Changelog
index 296dd2b8b..be6ce2e16 100644
--- a/Changelog
+++ b/Changelog
@@ -37,6 +37,7 @@
     - FEATURE: Include DHT traffic in the rate limiter (libtorrent >= v0.15 only)
     - FEATURE: Support for bitcomet padding files (libtorrent >= v0.15 only)
     - FEATURE: Option to skip file checking and start seeding immediately in torrent addition dialog (Stephanos Antaris) (libtorrent >= v0.15 only)
+    - BUGFIX: Made sure qBittorrent does not scrape the tracker too frequently (libtorrent >= 0.15 only)
     - WEB UI: Remodeled Web UI to match new qBittorrent UI (Properties and preferences available)
     - WEB UI: Added internationalization support
     - WEB UI: Reduced computation in Javascript (do this one server side instead)
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index f1fbdc5dd..ff42162e0 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -313,8 +313,10 @@ void Bittorrent::configureSession() {
   // Speed up exit
   sessionSettings.stop_tracker_timeout = 1;
   //sessionSettings.announce_to_all_trackers = true;
+  sessionSettings.auto_scrape_interval = 1200; // 20 minutes
 #ifdef LIBTORRENT_0_15
   sessionSettings.announce_to_all_tiers = true; //uTorrent behavior
+  sessionSettings.auto_scrape_min_interval = 900; // 15 minutes
 #endif
   // To keep same behavior as in qBittorrent v1.2.0
   sessionSettings.rate_limit_ip_overhead = false;