diff --git a/static/css/note.css b/static/css/note.css
index efc5c44..de6d863 100644
--- a/static/css/note.css
+++ b/static/css/note.css
@@ -4,7 +4,7 @@ body {
 }
 
 h3 {
-  margin-bottom: 0.5em;
+  margin-bottom: 1em;
 }
 
 .button {
diff --git a/static/html/contact us.html b/static/html/contact us.html
new file mode 100644
index 0000000..ab2d9d6
--- /dev/null
+++ b/static/html/contact us.html	
@@ -0,0 +1,10 @@
+<h3>contact us</h3>
+
+<p><b>Have a question?</b> First, please check our <a
+href="/notebooks/%s?note_id=new">faq</a> to see if it's answered there.</p>
+
+<p><b>Still need some help?</b> Have a comment or feature request? We'd love
+to hear from you! You can contact us directly at <a
+href="mailto:support@luminotes.com" target="_top">support@luminotes.com</a>.
+Please note that you may receive an automated email asking you to confirm your
+message.</p>
diff --git a/static/html/faq.html b/static/html/faq.html
new file mode 100644
index 0000000..63a6729
--- /dev/null
+++ b/static/html/faq.html
@@ -0,0 +1,43 @@
+<h3>faq</h3>
+
+<b>What about privacy?</b><br />
+
+<p>Your interaction with Luminotes is protected by 256-bit SSL encryption, so
+you don't have to worry about anyone snooping on your wiki notes. And we'll
+never, ever look at the contents of your wiki or share it with anyone unless
+you give us your permission or make the wiki public.</p>
+
+<b>What about backups?</b><br />
+
+<p>Our database is fully backed up every day, and you can even download the
+entire contents of your wiki by clicking "download as html" whenever you
+want.</p>
+
+<b>Does this cost me anything?</b><br />
+
+<p>Nope, use of your personal Luminotes wiki is completely free. In the future,
+we may introduce a separate premium service with additional features. But the
+features you're using now will always remain free.</p>
+
+<b>Where's the source code?</b><br />
+
+<p>For the software developers among you: <a
+href="/static/luminotes.tar.gz">Right here.</a> It's GPL. Enjoy.</p>
+
+<b>What does Luminotes run on?</b><br />
+
+<ul>
+  <li><a href="http://python.org/" target="_top">Python</a></li>
+  <li><a href="http://debian.org/" target="_top">Debian GNU/Linux</a></li>
+  <li><a href="http://pybsddb.sourceforge.net/" target="_top">BerkeleyDB</a></li>
+  <li><a href="http://apache.org/" target="_top">Apache</a></li>
+  <li><a href="http://cherrypy.org/" target="_top">CherryPy</a></li>
+  <li><a href="http://mochikit.com/" target="_top">MochiKit</a></li>
+  <li><a href="http://somethingaboutorange.com/mrl/projects/nose/" target="_top">nose</a></li>
+  <li><a href="http://undefined.org/python/" target="_top">simplejson</a></li>
+</ul>
+
+<b>I've got a question that isn't answered here!</b><br />
+
+<p>Please <a href="/notebooks/%s?note_id=new">contact us</a> and we'll be happy
+to answer it.</p>
diff --git a/static/html/navigation.html b/static/html/navigation.html
index 3d07bbd..644dca3 100644
--- a/static/html/navigation.html
+++ b/static/html/navigation.html
@@ -2,4 +2,6 @@
 <a href="/notebooks/%s?note_id=new">features</a> -
 <a href="/notebooks/%s?note_id=new">take a tour</a> -
 <a href="/notebooks/%s?note_id=new" target="_top">try it out</a> -
+<a href="/notebooks/%s?note_id=new">faq</a> -
+<a href="/notebooks/%s?note_id=new">contact us</a> -
 <a href="/notebooks/%s?note_id=new" target="_top">login</a>
diff --git a/tools/initdb.py b/tools/initdb.py
index 9045538..c1b0eeb 100644
--- a/tools/initdb.py
+++ b/tools/initdb.py
@@ -18,6 +18,8 @@ class Initializer( object ):
     ( u"features.html", True ),
     ( u"take a tour.html", False ),
     ( u"try it out.html", False ),
+    ( u"faq.html", False ),
+    ( u"contact us.html", False ),
     ( u"login.html", False ),
     ( u"password reset.html", False ),
     ( u"supported browsers.html", False ),
@@ -108,7 +110,7 @@ def fix_note_contents( contents, notebook_id, note_ids ):
       https_url = settings[ u"global" ].get( u"luminotes.https_url", u"" )
 
     return u"".join( [
-      match.group( 1 ), https_url, match.group( 2 ), note_ids[ title + ".html" ],
+      match.group( 1 ), https_url, match.group( 2 ), note_ids.get( title + u".html", u"new" ),
       match.group( 4 ), match.group( 5 ), match.group( 6 ),
     ] )
 
diff --git a/tools/updatedb.py b/tools/updatedb.py
index 58b44b3..75d5d08 100755
--- a/tools/updatedb.py
+++ b/tools/updatedb.py
@@ -16,6 +16,8 @@ class Initializer( object ):
     ( u"features.html", True ),
     ( u"take a tour.html", False ),
     ( u"try it out.html", False ),
+    ( u"faq.html", False ),
+    ( u"contact us.html", False ),
     ( u"login.html", False ),
     ( u"password reset.html", False ),
     ( u"supported browsers.html", False ),
@@ -47,7 +49,9 @@ class Initializer( object ):
     for ( filename, startup ) in self.NOTE_FILES:
       title = filename.replace( u".html", u"" )
       note = main_notebook.lookup_note_by_title( title )
-      note_ids[ filename ] = note.object_id
+
+      if note is not None:
+        note_ids[ filename ] = note.object_id
 
     # update the navigation note if its id was given
     if self.navigation_note_id: