diff --git a/download.html b/download.html
index 55a10d31777942a339b50aa98bdef16eee3fc022..8c3cf4e4fefd07efb4f1f3d219d1016f97b6ad5d 100644
--- a/download.html
+++ b/download.html
@@ -50,9 +50,11 @@
         <div class="full">
           <h2>Public Beta</h2>
 
-          <p>Briar for Android is currently in <a href="news/2017-beta-released-security-audit.html">public beta</a> and is available for download <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta">from Google Play</a>.</p>
+          <p>Briar for Android is currently in <a href="news/2017-beta-released-security-audit.html">public beta</a> and is available for download from Google Play.</p>
 
-          <p>If you prefer not to use Google Play, the <a href="https://briarproject.org/manual">manual</a> describes how to download the app directly from this site.</p>
+          <p><a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"/></a></p>
+
+          <p>If you prefer not to use Google Play, you can <a href="fdroid.html">install the app via F-Droid</a> or <a href="manual/#installation">download the APK file</a> directly from our site.</p>
 
           <p>If you'd like to be informed when the final app is available, please <a href="https://lists.sourceforge.net/lists/listinfo/briar-announce">join the announcement mailing list</a>.</p>
 
diff --git a/fdroid.html b/fdroid.html
new file mode 100644
index 0000000000000000000000000000000000000000..d7a19044045af3703ef72e6314d716ddd4d64fe2
--- /dev/null
+++ b/fdroid.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <link rel="stylesheet" type="text/css" href="css/styles.css" />
+  <title>Briar</title>
+  <meta name="description" content="Secure messaging, anywhere"/>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="flattr:id" content="4pq200">
+</head>
+<body id="download">
+
+  <div id="wrapper">
+    <div id="header_container">
+      <div id="header">
+        <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
+        <div id="nav">
+          <iframe id="signupframe" style="display: none" name="signupframe" src="about:blank"></iframe>
+          <div id="signup">
+            <form id="signupform" action="https://lists.sourceforge.net/lists/subscribe/briar-announce" target="signupframe" method="post">
+              <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
+              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+            </form>
+            <div id="signupconf">Thanks! We'll keep you updated.</div>
+            <script language="JavaScript">
+            <!--
+            function _submit_form(){
+                document.getElementById('signupform').style.display = 'none';
+                document.getElementById('signupconf').style.display = 'block';
+                return true
+            }
+            //-->
+            </script>
+          </div> <!-- signup -->
+          <label for="menu-toggle"><img src="img/menu.png"></label>
+          <input type="checkbox" id="menu-toggle"/>
+          <ul id="menu">
+            <li><a href="index.html" id="indexnav">Home</a></li>
+            <li><a href="download.html" id="downloadnav">Download</a></li>
+            <li><a href="how-it-works.html" id="hownav">How&nbsp;it&nbsp;Works</a></li>
+            <li><a href="about.html" id="aboutnav">About&nbsp;Us</a></li>
+            <li><a href="get-involved.html" id="involvednav">Get&nbsp;Involved</a></li>
+          </ul>
+        </div> <!-- nav -->
+      </div> <!-- header -->
+    </div> <!-- header_container -->
+
+    <div id="container">
+      <div id="content">
+        <div class="full">
+          <h2>Installing Briar via F-Droid</h2>
+
+          <p>1) Open <a href="https://briarproject.org/fdroid/repo?fingerprint=1FB874BEE7276D28ECB2C9B06E8A122EC4BCB4008161436CE474C257CBF49BD6">this link</a> on your mobile device. (If you're using Firefox, long-click the link and choose <b>Open with F-Droid App</b>.)</p>
+
+          <p>2) Choose <b>F-Droid</b> and click <b>Just Once</b>.</p>
+
+          <img src="img/fdroid/fdroid-app-chooser-cropped.png">
+
+          <p>3) When the <b>Add new repository</b> screen appears, click <b>Add</b>.</p>
+
+          <img src="img/fdroid/fdroid-add-repo-cropped.png">
+
+          <p>4) F-Droid will update the list of available apps. When it finishes, search for <b>Briar Beta</b> in the F-Droid app.</p>
+
+          <img src="img/fdroid/fdroid-search-results-cropped.png">
+
+        </div> <!-- full -->
+      </div> <!-- content -->
+    </div> <!-- container -->
+  </div> <!-- wrapper -->
+
+  <div class="clearboth"></div>
+
+  <div id="footer_container">
+    <div id="footer">
+      <div id="signup2">
+        <form id="signupform2" action="https://lists.sourceforge.net/lists/subscribe/briar-announce" target="signupframe" method="post">
+          <input placeholder="Email address" type="email" name="email" tabindex="2"    ></input>
+          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+        </form>
+        <div id="signupconf2">Thanks! We'll keep you updated.</div>
+        <script language="JavaScript">
+        <!--
+        function _submit_form2(){
+            document.getElementById('signupform2').style.display = 'none';
+            document.getElementById('signupconf2').style.display = 'block';
+            return true
+        }
+        //-->
+        </script>
+      </div> <!-- signup2 -->
+      <ul>
+        <li><a href="copyright.html">Copyright</a></li>
+        <li><a href="privacy.html">Privacy</a></li>
+        <li>Site design by Reflective Spaces</li>
+      </ul>
+    </div> <!-- footer -->
+  </div> <!-- footer_container -->
+</body>
+</html>
diff --git a/img/fdroid/fdroid-add-repo-cropped.png b/img/fdroid/fdroid-add-repo-cropped.png
new file mode 100644
index 0000000000000000000000000000000000000000..465a199bc8b153719183614c5a69b45efafe48f0
Binary files /dev/null and b/img/fdroid/fdroid-add-repo-cropped.png differ
diff --git a/img/fdroid/fdroid-app-chooser-cropped.png b/img/fdroid/fdroid-app-chooser-cropped.png
new file mode 100644
index 0000000000000000000000000000000000000000..16adeb7aeff3e29eb595eec5c2d6441709be7140
Binary files /dev/null and b/img/fdroid/fdroid-app-chooser-cropped.png differ
diff --git a/img/fdroid/fdroid-search-results-cropped.png b/img/fdroid/fdroid-search-results-cropped.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9293859001a3b9d14d1f58043446dcb769ab850
Binary files /dev/null and b/img/fdroid/fdroid-search-results-cropped.png differ