diff --git a/browserid/lib/prove_template.txt b/browserid/lib/prove_template.txt
index 09a7d7c8e4acb7987d05ab014098d57025535f10..3bc70f5932def67aa8e7828ae50fea2af28e49ed 100644
--- a/browserid/lib/prove_template.txt
+++ b/browserid/lib/prove_template.txt
@@ -5,7 +5,7 @@ This message is being sent to you to complete your login to
  
 {{link}}
  
-If you are NOT trying to log into {{site}}, just ignore this email. 
+If you are NOT trying to sign into {{site}}, just ignore this email. 
  
 Thanks,
 BrowserID
diff --git a/browserid/static/dialog/index.html b/browserid/static/dialog/index.html
index 34b6ba9e8d38449e839d51880103435a2b9ede02..5b9e03938fa27be550026da55699f9174d1f57e2 100644
--- a/browserid/static/dialog/index.html
+++ b/browserid/static/dialog/index.html
@@ -5,7 +5,7 @@
 </head>
 <body id="body">
 <div id="header">
-  <div class="title"><img src="../i/browserid_logo_lil.png"></div><div class="subtitle">A better way to log in.</div>
+  <div class="title"><img src="../i/browserid_logo_lil.png"></div><div class="subtitle">A better way to sign in.</div>
 </div>
 <div id="authenticate_dialog" class="dialog">
   <div class="content">
@@ -46,7 +46,7 @@
       <div class="note"><span class="bad">Enter a password</span></div>
     </div>
     <div class="attention_lame">
-      <span id="in_use_email">Email</span> in use, If this email is yours you can <a href="#">log in</a> with it?
+      <span id="in_use_email">Email</span> in use, If this email is yours you can <a href="#">sign in</a> with it?
     </div>
   </div>
 </div>
@@ -84,7 +84,7 @@
 </div>
 <div id="sign_in_dialog" class="dialog">
   <div class="content">
-    <p class="prompt">What email address would you like to use to log into <span class="sitename bad"></span>?</p>
+    <p class="prompt">What email address would you like to use to sign into <span class="sitename bad"></span>?</p>
     <form id="identities" name="identities">
     </form>
   </div>
diff --git a/browserid/static/dialog/main.js b/browserid/static/dialog/main.js
index e17f0ce41c3b9bd7410781ae12e8f6b2ea17a71c..50b0ea76e775396e313c9771245932f591d171ef 100644
--- a/browserid/static/dialog/main.js
+++ b/browserid/static/dialog/main.js
@@ -230,8 +230,8 @@
             $("#authenticate_dialog div.attention_lame").hide().fadeIn(400);
           } else {
             runWaitingDialog(
-              "Finishing Log In...",
-              "In just a moment you'll be logged into BrowserID.",
+              "Finishing Sign In...",
+              "In just a moment you'll be signed into BrowserID.",
               onsuccess, onerror);
 
             syncIdentities(onsuccess, onerror);
diff --git a/browserid/static/index.html b/browserid/static/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..ae7034079ceeb7529158e414acdd1a8bd9ce9759
--- /dev/null
+++ b/browserid/static/index.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <title>BrowserID: A better way to sign in.</title>
+  <link rel="stylesheet" href="css/style.css"  type="text/css">
+</head>
+<body>
+<div id="splash">
+  <div class="header">
+    <div class="manage"><a id="manageLink" href="manage.html">my account</a></div>
+  </div>
+  <div class="tophalf">
+    <div class="title"><img src="i/browserid_logo.png"></div>
+    <div class="subtitle">A better way to sign in.</div>
+  </div>
+  <div class="bottomhalf">
+    <div class="why">
+      <img style="float: right;" src="i/people.png">
+      <p>For <b>users</b>, BrowserID provides a <b>safer and easier</b> way to sign in.  <a href="users.html">How it works.</a></p>
+    </div>
+    <div class="why">
+      <img style="float: left;" src="i/developers.png">
+      <p>For <b>developers</b>, BrowserID offers a world class sign-in experience with only a couple lines of code. <a href="developers.html">Get Started.</a></p>
+    </div>
+    <div class="why">
+      <img style="float: right;" src="i/id.png">
+      <p>For <b>identity providers</b>, BrowserID lets your give your users an identity they can <b>use everywhere</b>. <a href="primaries.html">Dig Deeper.</a> </p>
+    </div>
+  </div>
+  <div class="footer">
+    <div>
+      <div class="right">
+        <p><img src="i/browserid_logo_sm.png"> is an <b>open source experiment</b> into improving identity and authentication on the web, by
+          <a href="https://mozillalabs.com">mozilla labs</a>.</p>
+      </div>
+      <div class="left">
+        <p> <a href="https://github.com/mozilla/browserid">Source Code</a>&nbsp;&nbsp;&nbsp;<a href="https://wiki.mozilla.org/Identity/Verified_Email_Protocol">Specification</a>&nbsp;&nbsp;&nbsp;<a href="https://groups.google.com/forum/?hl=en#!forum/mozilla.dev.identity">Mailing list</a> </p>
+        <p class="copyright">Copyright © 2011 Mozilla.  All rights reserved. </p>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/browserid/views/developers.ejs b/browserid/views/developers.ejs
index 4d3d03e89caa1d9b206ebb783ffb8cda309dd943..91c7df8d7c98bdab5f4df4203b1f8d4e2618faee 100644
--- a/browserid/views/developers.ejs
+++ b/browserid/views/developers.ejs
@@ -23,7 +23,7 @@
 <pre><code class="javascript">navigator.id.getVerifiedEmail(function(assertion) {
     if (assertion) {
         // This code will be invoked once the user has successfully
-        // selected an email address they control to log in with.
+        // selected an email address they control to sign in with.
     } else {
         // something went wrong!  the user isn't logged in.
     }
@@ -86,7 +86,7 @@
       </p>
     </div>
     <div class="step">
-      <p><b>Complete the log in!</b>  Having completed the steps
+      <p><b>Complete the sign in!</b>  Having completed the steps
         above, you can trust that the present user really owns the
         email address returned by the verifier.  You don't need to
         perform any additional authentication unless you want to!
diff --git a/primary/static/index.html b/primary/static/index.html
index 783f4ba5495f32707971618fcdff4def8766eae2..efa12b4d229267375ba08062384f82ff829e1626 100644
--- a/primary/static/index.html
+++ b/primary/static/index.html
@@ -20,7 +20,7 @@
 <div id="authenticate_dialog" class="dialog">
   <div class="title"> Sign in to PrimaryCo </div>
   <div class="content">
-    <div class="summary">Log in to your PrimaryCo account: <span class="sitename bad"></span>:</div>
+    <div class="summary">Sign in to your PrimaryCo account: <span class="sitename bad"></span>:</div>
     <div class="input">
       <div class="label"> Account </div>
       <div class="input"> <input type="text"></input></div>
@@ -62,7 +62,7 @@
       <div class="note"><span class="bad">Enter a password</span></div>
     </div>
     <div class="attention_lame">
-      <span id="in_use_email">Username</span> is already registered.  Did you already register it?  You can <a href="#">log in</a> if you like.
+      <span id="in_use_email">Username</span> is already registered.  Did you already register it?  You can <a href="#">sign in</a> if you like.
     </div>
     <div class="bottom-bar">
       <button id="create_submit" class="righty action">Sign In</button>