diff --git a/index.html b/index.html
index 2418d3ef..f6b5c471 100644
--- a/index.html
+++ b/index.html
@@ -1488,15 +1488,12 @@
 						<h3 class="panel-title">Mobile: Signal</h3>
 					</div>
 					<div class="panel-body">
-						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by <a href="https://whispersystems.org/">Open Whisper Systems</a>. The app provides end-to-end encrypted
-							instant messaging. Signal is free and open source, enabling anyone to verify its security by auditing the code. Encrypted group chats are also supported. The development team is supported by community donations and grants. There are no advertisements,
+						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by Open Whisper Systems. The app provides end-to-end encrypted
+							instant messaging as well as end-to-end encrypted voice and video calling. Signal is free and open source, enabling anyone to verify its security by auditing the code. Encrypted group chats are also supported. The development team is supported by community donations and grants. There are no advertisements,
 							and it doesn't cost anything to use.</p>
 						<p>
-							<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms">
-								<button type="button" class="btn btn-success">Android: google.com</button>
-							</a>
-							<a href="https://itunes.apple.com/app/id874139669">
-								<button type="button" class="btn btn-success">iOS: apple.com</button>
+							<a href="https://signal.org">
+								<button type="button" class="btn btn-success">Download: signal.org</button>
 							</a>
 						</p>
 						<p>OS: Android, iOS.</p>
@@ -1554,6 +1551,7 @@
 		<ul>
 			<li><a href="https://motherboard.vice.com/read/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></li>
 			<li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
+			<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
 		</ul>
 
 		<a class="anchor" name="voip"></a>
@@ -1567,18 +1565,16 @@
 			<div class="col-sm-4">
 				<div class="panel panel-success">
 					<div class="panel-heading">
-						<h3 class="panel-title">Signal for Mobile</h3>
+						<h3 class="panel-title">Mobile: Signal</h3>
 					</div>
 
 					<div class="panel-body">
-						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by <a href="https://whispersystems.org/">Open Whisper Systems</a>. The app provides end-to-end encryption
-							for your calls. Signal is free and open source, enabling anyone to verify its security by auditing the code.</p>
+						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by Open Whisper Systems. The app provides end-to-end encrypted
+							instant messaging as well as end-to-end encrypted voice and video calling. Signal is free and open source, enabling anyone to verify its security by auditing the code. Encrypted group chats are also supported. The development team is supported by community donations and grants. There are no advertisements,
+							and it doesn't cost anything to use.</p>
 						<p>
-							<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms">
-								<button type="button" class="btn btn-success">Android: google.com</button>
-							</a>
-							<a href="https://itunes.apple.com/app/id874139669">
-								<button type="button" class="btn btn-success">iOS: apple.com</button>
+							<a href="https://signal.org">
+								<button type="button" class="btn btn-success">Download: signal.org</button>
 							</a>
 						</p>
 						<p>OS: iOS, Android.</p>
@@ -1629,6 +1625,11 @@
 			<li><a href="http://www.ring.cx/">Ring (formerly SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
 		</ul>
 
+		<h3>Related Information</h3>
+		<ul>
+			<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
+		</ul>
+
 		<a class="anchor" name="cloud"></a>
 		<div class="page-header">
 			<h1><a href="#cloud" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Encrypted Cloud Storage Services</h1>