diff --git a/_config.yml b/_config.yml
index a9c0e67..9185388 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,7 @@
 name: My blog
 description: A jekyll theme
+url: http://scotte.github.io
+baseurl: /jekyll-clean
 
 # Set the following to enable these features, leave as '' to disable them
 github: 'scotte/jekyll-clean'
diff --git a/_includes/header.html b/_includes/header.html
index 3e67443..93713eb 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,10 +5,10 @@
     <meta charset="UTF-8">
     <title>{{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="/js/jquery.min.js"></script>
-    <script src="/js/bootstrap.min.js"></script>
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/css/theme.css" rel="stylesheet">
+    <script src="{{ site.baseurl }}/js/jquery.min.js"></script>
+    <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
+    <link href="{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/theme.css" rel="stylesheet">
 </head>
 
 <body>
@@ -17,12 +17,12 @@
     <div class="row-fluid">
         <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <div class="navbar-header">
-                <a class="navbar-brand" href="/">{{ site.name }}</a>
+                <a class="navbar-brand" href="{{ site.baseurl }}">{{ site.name }}</a>
                 <ul class="nav navbar-nav">
-                    <li class="active"><a href="/">Home</a></li>
-                    <li class="active"><a href="/archive.html">Archive</a></li>
-                    <li class="active"><a href="/about.html">About</a></li>
-                    <li class="active"><a href="/atom.xml">RSS</a></li>
+                    <li class="active"><a href="{{ site.baseurl }}">Home</a></li>
+                    <li class="active"><a href="{{ site.baseurl }}/archive.html">Archive</a></li>
+                    <li class="active"><a href="{{ site.baseurl }}/about.html">About</a></li>
+                    <li class="active"><a href="{{ site.baseurl }}/atom.xml">RSS</a></li>
                     {% if site.github != '' %}
                       <li class="active"><a href="https://github.com/{{ site.github }}">Github</a></li>
                     {% endif %}
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 2946aa8..8c73f1f 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -6,7 +6,7 @@
     <h1>Recent Posts</h1>
     <ul>
         {% for post in site.posts limit:5 %}
-          <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+          <li><a href="{{ site.baseurl}}{{ post.url }}">{{ post.title }}</a></li>
         {% endfor %}
     </ul>
 </div>
diff --git a/_layouts/post.html b/_layouts/post.html
index 2c4e048..896dd30 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -8,7 +8,7 @@
         <div class="col-md-9">
           <div class="article">
             <div class="well">
-                <h1><a href="{{ page.url }}">{{ page.date | date: "%b %-d, %Y" }} - {{ page.title }}</a></h1>
+                <h1><a href="{{ site.baseurl}}{{ page.url }}">{{ page.date | date: "%b %-d, %Y" }} - {{ page.title }}</a></h1>
             {% if site.comments == true and page.comments == true and site.disqus != '' %}
                 <p class="author"><a href="#disqus_thread">Comments</a></p>
             {% endif %}
@@ -25,10 +25,10 @@
           </div>
           <div class="pagination">
               {% if page.next %}
-                <a class="btn btn-default" href="{{ page.next.url }}" class="next">Newer Post</a>
+                <a class="btn btn-default" href="{{ site.baseurl}}{{ page.next.url }}" class="next">Newer Post</a>
               {% endif %}
               {% if page.previous %}
-                <a class="btn btn-default" href="{{ page.previous.url }}" class="previous">Older Post</a>
+                <a class="btn btn-default" href="{{ site.baseurl}}{{ page.previous.url }}" class="previous">Older Post</a>
               {% endif %}
 </div>
 
diff --git a/archive.html b/archive.html
index 13e7496..2056c92 100644
--- a/archive.html
+++ b/archive.html
@@ -16,7 +16,7 @@ layout: default
             <ul>
         {% endif %}
     {% endunless %}
-    <li><a href="{{ post.url }}">{{ post.date | date: "%b %-d" }} - {{ post.title }}</a></li>
+    <li><a href="{{ site.baseurl}}{{ post.url }}">{{ post.date | date: "%b %-d" }} - {{ post.title }}</a></li>
 {% endfor %}
 </ul>
 </div>
diff --git a/atom.xml b/atom.xml
index bc642ec..f61dcdd 100644
--- a/atom.xml
+++ b/atom.xml
@@ -7,15 +7,15 @@ layout: none
 	<channel>
 		<title>{{ site.name }}</title>
 		<description>{{ site.description }}</description>
-		<link>{{ site.url }}</link>
-		<atom:link href="{{ site.url }}/atom.xml" rel="self" type="application/rss+xml" />
+		<link>{{ site.baseurl}}{{ site.url }}</link>
+		<atom:link href="{{ site.baseurl}}{{ site.url }}/atom.xml" rel="self" type="application/rss+xml" />
 		{% for post in site.posts limit:10 %}
 			<item>
 				<title>{{ post.title }}</title>
 				<description>{{ post.content | xml_escape }}</description>
 				<pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
-				<link>{{ site.url }}{{ post.url }}</link>
-				<guid isPermaLink="true">{{ site.url }}{{ post.url }}</guid>
+				<link>{{ site.url }}{{ site.baseurl}}{{ post.url }}</link>
+				<guid isPermaLink="true">{{ site.url }}{{ site.baseurl}}{{ post.url }}</guid>
 			</item>
 		{% endfor %}
 	</channel>
diff --git a/index.html b/index.html
index 20be51b..e0c0eb7 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@ layout: default
 {% for post in paginator.posts %}
 <div class="article">
     <div class="well">
-        <h1><a href="{{ post.url }}">{{ post.date | date: "%b %-d, %Y" }} - {{ post.title }}</a></h1>
+        <h1><a href="{{ site.baseurl}}{{ post.url }}">{{ post.date | date: "%b %-d, %Y" }} - {{ post.title }}</a></h1>
         {% if site.comments == true and post.comments == true and site.disqus != '' %}
           <p class="author"># Comments</p>
         {% endif %}
@@ -19,13 +19,13 @@ layout: default
 <div class="pagination">
   {% if paginator.previous_page %}
       {% if paginator.previous_page == 1 %}
-        <a class="btn btn-default" href="/index.html" class="previous">Newer</a>
+        <a class="btn btn-default" href="{{ site.baseurl}}/index.html" class="previous">Newer</a>
       {% else %}
-        <a class="btn btn-default" href="/page{{ paginator.previous_page }}" class="previous">Newer</a>
+        <a class="btn btn-default" href="{{ site.baseurl}}/page{{ paginator.previous_page }}" class="previous">Newer</a>
       {% endif %}
   {% endif %}
   <span class="page_number ">Page: {{ paginator.page }} of {{ paginator.total_pages }}</span>
   {% if paginator.next_page %}
-    <a class="btn btn-default" href="/page{{ paginator.next_page }}" class="next">Older</a>
+    <a class="btn btn-default" href="{{ site.baseurl}}/page{{ paginator.next_page }}" class="next">Older</a>
   {% endif %}
 </div>
