diff --git a/html.cjsx b/html.cjsx
index ba92ec8688..ef158c14f4 100644
--- a/html.cjsx
+++ b/html.cjsx
@@ -1,15 +1,23 @@
 React = require 'react'
 Typography = require 'typography'
+DocumentTitle = require 'react-document-title'
 
 typography = new Typography()
 {TypographyStyle} = typography
 
 module.exports = React.createClass
   getDefaultProps: ->
-    title: "Default title"
     body: ""
 
   render: ->
+    title = DocumentTitle.rewind()
+    if @props.title then title = @props.title
+
+    if __GH_PAGES__? and __GH_PAGES__
+      urlPrefix = @props.config.ghPagesURLPrefix
+    else
+      urlPrefix = ""
+
     <html lang="en">
       <head>
         <meta charSet="utf-8"/>
@@ -36,6 +44,6 @@ module.exports = React.createClass
       </head>
       <body className="landing-page">
         <div id="react-mount" dangerouslySetInnerHTML={{__html: @props.body}} />
-        <script src="/bundle.js"/>
+        <script src={urlPrefix + "/bundle.js"}/>
       </body>
     </html>
diff --git a/pages/index.cjsx b/pages/index.cjsx
index b2f13e4d85..1cba76e436 100644
--- a/pages/index.cjsx
+++ b/pages/index.cjsx
@@ -2,6 +2,7 @@ React = require 'react'
 Router = require 'react-router'
 {RouteHandler, Link} = Router
 sortBy = require 'lodash/collection/sortBy'
+DocumentTitle = require 'react-document-title'
 {link} = require 'gatsby-helpers'
 
 module.exports = React.createClass
@@ -26,25 +27,27 @@ module.exports = React.createClass
           </li>
         )
 
-    <div>
-      <p
-        style={{
-          marginBottom: rhythm(2.5)
-        }}
-      >
-        <img
-          src="./kyle-round-small-pantheon.jpg"
+    <DocumentTitle title="#{@props.config.blogTitle}">
+      <div>
+        <p
           style={{
-            float: 'left'
-            marginRight: rhythm(1/4)
-            marginBottom: 0
-            width: rhythm(2)
-            height: rhythm(2)
+            marginBottom: rhythm(2.5)
           }}
-        />
-        Written by <strong>{@props.config.authorName}</strong> who lives and works in San Francisco building useful things. <a href="https://twitter.com/kylemathews">You should follow him on Twitter</a>
-      </p>
-      <ul>
-        {pageLinks}
-      </ul>
-    </div>
+        >
+          <img
+            src="./kyle-round-small-pantheon.jpg"
+            style={{
+              float: 'left'
+              marginRight: rhythm(1/4)
+              marginBottom: 0
+              width: rhythm(2)
+              height: rhythm(2)
+            }}
+          />
+          Written by <strong>{@props.config.authorName}</strong> who lives and works in San Francisco building useful things. <a href="https://twitter.com/kylemathews">You should follow him on Twitter</a>
+        </p>
+        <ul>
+          {pageLinks}
+        </ul>
+      </div>
+    </DocumentTitle>
diff --git a/wrappers/md.cjsx b/wrappers/md.cjsx
index 900e0bc60e..bdedb02100 100644
--- a/wrappers/md.cjsx
+++ b/wrappers/md.cjsx
@@ -2,6 +2,7 @@ React = require 'react'
 require '../css/zenburn.css'
 moment = require 'moment'
 DocumentTitle = require 'react-document-title'
+{link} = require 'gatsby-helpers'
 
 ReadNext = require '../components/ReadNext'
 
@@ -12,7 +13,7 @@ module.exports = React.createClass
     {rhythm} = @props.typography
     post = @props.page.data
 
-    <DocumentTitle title="Name of blog | #{post.title}">
+    <DocumentTitle title="#{post.title} | #{@props.config.blogTitle}">
       <div className="markdown">
         <h1>{post.title}</h1>
         <div dangerouslySetInnerHTML={{__html: post.body}}/>
@@ -32,7 +33,7 @@ module.exports = React.createClass
         <ReadNext post={post} {...@props}/>
         <p>
           <img
-            src="/kyle-round-small-pantheon.jpg"
+            src={link("/kyle-round-small-pantheon.jpg")}
             style={{
               float: 'left'
               marginRight: rhythm(1/4)
