diff --git a/common/code/boost_pages.php b/common/code/boost_pages.php
index 22e56d9e..e7748d05 100644
--- a/common/code/boost_pages.php
+++ b/common/code/boost_pages.php
@@ -325,21 +325,21 @@ class BoostPages_Page {
                 'downloads' => array(
                     'unix' => array(
                         array(
-                            'url' => "https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.tar.bz2",
+                            'url' => "https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.tar.bz2",
                             'sha256' => '866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c',
                         ),
                         array(
-                            'url' => "https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.tar.gz",
+                            'url' => "https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.tar.gz",
                             'sha256' => '0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474',
                         ),
                     ),
                     'windows' => array(
                         array(
-                            'url' => "https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.7z",
+                            'url' => "https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.7z",
                             'sha256' => '3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4',
                         ),
                         array(
-                            'url' => "https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.zip",
+                            'url' => "https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.zip",
                             'sha256' => '9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615',
                         ),
                     ),
@@ -455,10 +455,10 @@ class BoostPages_Page {
 
                     $output .= '<td><a href="';
                     if (strpos($download['url'], 'sourceforge') !== false) {
-                        // TODO: Probably shouldn't add '/download' any more,
-                        //       but keeping to minimise changes in generated
-                        //       files for now.
-                        $output .= html_encode("{$download['url']}/download");
+                        // TODO: I used to add '/download' to source links,
+                        //       but that doesn't seem to be needed any more...
+                        //$output .= html_encode("{$download['url']}/download");
+                        $output .= html_encode($download['url']);
                     }
                     else {
                         $output .= html_encode($download['url']);
diff --git a/feed/history/boost_1_61_0.qbk b/feed/history/boost_1_61_0.qbk
index 653ab0ed..0ec7c331 100644
--- a/feed/history/boost_1_61_0.qbk
+++ b/feed/history/boost_1_61_0.qbk
@@ -21,7 +21,7 @@
 [documentation /doc/libs/1_61_0_b1/]
 [final_documentation /doc/libs/1_61_0/]
 [download_basename boost_1_61_0_b1]
-[download https://bintray.com/boostorg/release/boost/1.61.0.beta.1/view]
+[download https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/]
 
 [section New Libraries]
 
diff --git a/generated/download-items.html b/generated/download-items.html
index edfba8a4..8ad66959 100644
--- a/generated/download-items.html
+++ b/generated/download-items.html
@@ -38,6 +38,6 @@
 
 <ul class="menu">
 <li><a href="/users/history/version_1_61_0.html">Release Notes</a></li>
-<li><a href="https://bintray.com/boostorg/release/boost/1.61.0.beta.1/view">Download</a></li>
+<li><a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/">Download</a></li>
 <li><a href="/doc/libs/1_61_0_b1/">Documentation</a></li>
 </ul>
diff --git a/generated/home-items.html b/generated/home-items.html
index 2d11b571..10226813 100644
--- a/generated/home-items.html
+++ b/generated/home-items.html
@@ -7,7 +7,7 @@
 </ul>
 <h3>Beta Release</h3>
 <ul>
-<li><div class="news-title"><a href="/users/history/version_1_61_0.html">Version 1.61.0 beta</a></div><div class="news-date"><a href="/users/history/version_1_61_0.html">Release Notes</a> | <a href="https://bintray.com/boostorg/release/boost/1.61.0.beta.1/view">Download</a> | <a href="/doc/libs/1_61_0_b1/">Documentation</a></div><div class="news-date">In Progress</div></li>
+<li><div class="news-title"><a href="/users/history/version_1_61_0.html">Version 1.61.0 beta</a></div><div class="news-date"><a href="/users/history/version_1_61_0.html">Release Notes</a> | <a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/">Download</a> | <a href="/doc/libs/1_61_0_b1/">Documentation</a></div><div class="news-date">In Progress</div></li>
 </ul>
 </div>
 <p><a href="/users/download/">More Downloads...</a> (<a href="feed/downloads.rss">RSS</a>)</p>
diff --git a/generated/state/feed-pages.txt b/generated/state/feed-pages.txt
index 61a6bdbd..0cbbfaf8 100644
--- a/generated/state/feed-pages.txt
+++ b/generated/state/feed-pages.txt
@@ -2392,7 +2392,7 @@
 -documentation
 "/doc/libs/1_61_0_b1/
 -download
-"https://bintray.com/boostorg/release/boost/1.61.0.beta.1/view
+"https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/
 -download_basename
 "boost_1_61_0_b1
 -final_documentation
@@ -2400,7 +2400,7 @@
 -id
 "version_1_61_0
 -last_modified
-=1459891766
+=1459953073
 -location
 "users/history/version_1_61_0.html
 -notice
@@ -2415,7 +2415,7 @@
 "      Lexical Cast, Log, Move, Optional, Test, Variant.
 "
 -qbk_hash
-"2aa01e3c62d7a8484864b34d2f1215e2b88105ce81bdf683aad8f798a8d6be50
+"e70b7f7bd3e00f09773ecdbd4efc9747557b899de6a3f73fb186f8f5925b9baf
 -release_status
 "beta
 -title
diff --git a/generated/state/rss-items.txt b/generated/state/rss-items.txt
index 7ce0c791..e738639f 100644
--- a/generated/state/rss-items.txt
+++ b/generated/state/rss-items.txt
@@ -31371,7 +31371,7 @@
 "  &lt;/div&gt;
 "</description></item>
 -last_modified
-=1459891766
+=1459953073
 -quickbook
 "feed/history/boost_1_61_0.qbk
 )
diff --git a/users/history/version_1_61_0.html b/users/history/version_1_61_0.html
index 758b8b22..13fddcbf 100644
--- a/users/history/version_1_61_0.html
+++ b/users/history/version_1_61_0.html
@@ -42,8 +42,8 @@
               <p><span class=news-date">In Progress</span></p>
               <p><a href="/doc/libs/1_61_0_b1/">Documentation</a>
               <table class="download-table"><caption>Beta Downloads</caption><tr><th scope="col">Platform</th><th scope="col">File</th><th scope="col">SHA256 Hash</th></tr>
-<tr><th scope="row" rowspan="2">unix</th><td><a href="https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.tar.bz2">boost_1_61_0_b1.tar.bz2</a></td><td>866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c</td></tr><tr><td><a href="https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.tar.gz">boost_1_61_0_b1.tar.gz</a></td><td>0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474</td></tr>
-<tr><th scope="row" rowspan="2">windows</th><td><a href="https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.7z">boost_1_61_0_b1.7z</a></td><td>3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4</td></tr><tr><td><a href="https://bintray.com/artifact/download/boostorg/release/boost_1_61_0_b1.zip">boost_1_61_0_b1.zip</a></td><td>9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615</td></tr></table><p><a href='/users/download/signatures/boost_1_61_0_b1.sums.asc'>List of checksums</a> signed by <a href='https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xDA472E8659753BA4'>Vladimir Prus</a></p>.
+<tr><th scope="row" rowspan="2">unix</th><td><a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.tar.bz2">boost_1_61_0_b1.tar.bz2</a></td><td>866941f0038b27fcc69ced1490b2dc5fa8d20f505d66b939a92a68ef194d1a6c</td></tr><tr><td><a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.tar.gz">boost_1_61_0_b1.tar.gz</a></td><td>0b92c5fb5b91641409b9675b2fd11d3b3fa5f71dd986d3b5fb03da201bf55474</td></tr>
+<tr><th scope="row" rowspan="2">windows</th><td><a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.7z">boost_1_61_0_b1.7z</a></td><td>3f8888099ee6f62b412a13be916dead2bacbdd6d69e5afd5b6fea4bb738e5df4</td></tr><tr><td><a href="https://sourceforge.net/projects/boost/files/boost/1.61.0.beta.1/boost_1_61_0_b1.zip">boost_1_61_0_b1.zip</a></td><td>9dffe5ee7f5f7bf7695f5738c686e44bd266933e3ca68732b0de5520c3c82615</td></tr></table><p><a href='/users/download/signatures/boost_1_61_0_b1.sums.asc'>List of checksums</a> signed by <a href='https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xDA472E8659753BA4'>Vladimir Prus</a></p>.
 
 <h3>Third Party Downloads</h3>
 <ul>