diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html
index e9a03c412201d0fed9a2e31d15f55de285c5c879..f532c1023209f7116ebef7a6fded70e0cbdfc87d 100644
--- a/pinaxcon/templates/static_pages/homepage.html
+++ b/pinaxcon/templates/static_pages/homepage.html
@@ -19,20 +19,54 @@
         <h3>A Python conference north of the Golden Gate</h3>
       </div>
 
-      <h3>
-        The Mystic Theatre</br>
-        Petaluma, California
-      </h3>
-
-      <h4>
-        <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
-        Talk submissions close September 29
-      </h4>
+      <div class="row">
+        <div class="col-md-6">
+          <h3>
+            The Mystic Theatre</br>
+            Petaluma, California
+          </h3>
+
+          <h4>
+            <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
+            Talk submissions close September 29
+          </h4>
+        </div>
+        <div class="col-md-4 col-md-offset-2">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h2 class="panel-title">Sign up for our low-volume announcements newsletter</h4>
+            </div>
+            <div class="panel-body">
+              <form
+                class="form-inline"
+                action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
+                <div class="form-group">
+                  <span>
+                    <label style="display: none;" for="tlemail">Email address:</label>
+                  </span>
+                  <span>
+                    <input class="form-control" type="email" name="email" id="tlemail" placeholder="E-mail address"/>
+                  </span>
+                </div>
+                <span>
+                  <input class="btn btn-primary" type="submit" value="Subscribe" />
+                </span>
+
+                <input type="hidden" value="1" name="embed"/>
+              </form>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
     </div>
 
     <div class="container homepage-block-footer">
-      <div class="btn-group">
-        <a class="btn btn-lg btn-primary btn-shadow" href="/dashboard" title="Submit a Proposal to North Bay Python">Submit a Proposal</a>
+      <div>
+        <a class="btn btn-primary btn-lg" href="/dashboard" title="Submit a Proposal to North Bay Python">Submit a Proposal</a>
+        <a class="btn btn-default btn-lg " href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a>
+        <a class="btn btn-default btn-lg" href="https://facebook.com/northbaypython" title="North Bay Python on Facebook">Facebook</a>
       </div>
     </div>
   </div>