diff --git a/Makefile.am b/Makefile.am
index d269f251..65fc633e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST= \
 	rak/partial_queue.h \
 	rak/priority_queue.h \
 	rak/priority_queue_default.h \
+	rak/ranges.h \
 	rak/regex.h \
 	rak/socket_address.h \
 	rak/string_manip.h \
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index 62460286..c5bbf17f 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -184,6 +184,9 @@ DownloadFactory::receive_success() {
 
   if (!control->variable()->get_value("max_chunks_queued") != 0)
     download->variable()->set("max_chunks_queued", control->variable()->get("max_chunks_queued"));
+  else
+    // Temporary until we fix the library.
+    download->variable()->set("max_chunks_queued", (512 << 20) / download->download()->chunks_size());
 
   if (!control->variable()->get_value("use_udp_trackers"))
     download->enable_udp_trackers(false);