diff --git a/_includes/pagination.liquid b/_includes/pagination.liquid
new file mode 100644
index 0000000..c3d0bfc
--- /dev/null
+++ b/_includes/pagination.liquid
@@ -0,0 +1,30 @@
+{% if paginator.total_pages > 1 %}
+	{% capture index_page_name %}{{ site.pagination.indexpage }}.{{ site.pagination.extension }}{% endcapture %}
+	<ul class="pager">
+		{% if paginator.previous_page %}
+		<li class="first">
+			<a href="{{ paginator.first_page_path | absolute_url | remove_first: index_page_name }}" alt="Oldest Entries">&laquo</a>
+		</li>
+		<li class="prev">
+			<a href="{{ paginator.previous_page_path | absolute_url | remove_first: index_page_name }}" alt="Older Entries">&larr;</a>
+		</li>
+		{% endif %}
+
+		{% if paginator.page_trail %}
+		{% for trail in paginator.page_trail %}
+		<li class="page{% if page.url == trail.path %} selected{% endif %}">
+			<a href="{{ trail.path | absolute_url | remove_first: index_page_name }}">{{ trail.num }}</a>
+		</li>
+		{% endfor %}
+		{% endif %}
+
+		{% if paginator.next_page %}
+		<li class="next">
+			<a href="{{ paginator.next_page_path | absolute_url | remove_first: index_page_name }}" alt="Newer Entries">&rarr;</a>
+		</li>
+		<li class="last">
+			<a href="{{ paginator.last_page_path | absolute_url | remove_first: index_page_name }}" alt="Newest Entries">&raquo;</a>
+		</li>
+		{% endif %}
+	</ul>
+{% endif %}
\ No newline at end of file
diff --git a/_layouts/index.liquid b/_layouts/index.liquid
index 41ed8e3..de7c89c 100644
--- a/_layouts/index.liquid
+++ b/_layouts/index.liquid
@@ -11,33 +11,5 @@
 	{% include article.liquid type=post index=true title=data.title content=content permalink=data.url categories=data.categories tags=data.tags timestamp=data.date %}
 {% endfor %}
 </div>
-{% if paginator.total_pages > 1 %}
-	<ul class="pager">
-		{% if paginator.previous_page %}
-		<li class="first">
-			<a href="{{ paginator.first_page_path | absolute_url }}" alt="Oldest Entries">&laquo</a>
-		</li>
-		<li class="prev">
-			<a href="{{ paginator.previous_page_path | absolute_url }}" alt="Older Entries">&larr;</a>
-		</li>
-		{% endif %}
-
-		{% if paginator.page_trail %}
-		{% for trail in paginator.page_trail %}
-		<li class="page{% if page.url == trail.path %} selected{% endif %}">
-			<a href="{{ trail.path | absolute_url }}">{{ trail.num }}</a>
-		</li>
-		{% endfor %}
-		{% endif %}
-
-		{% if paginator.next_page %}
-		<li class="next">
-			<a href="{{ paginator.next_page_path | absolute_url }}" alt="Newer Entries">&rarr;</a>
-		</li>
-		<li class="last">
-			<a href="{{ paginator.last_page_path | absolute_url }}" alt="Newest Entries">&raquo;</a>
-		</li>
-		{% endif %}
-	</ul>
-{% endif %}
+{% include pagination.liquid %}
 {% include page_end.liquid %}
diff --git a/_layouts/index_tags.liquid b/_layouts/index_tags.liquid
index 9ef8d43..68472d0 100644
--- a/_layouts/index_tags.liquid
+++ b/_layouts/index_tags.liquid
@@ -12,18 +12,5 @@
 	{% include article.liquid type=post index=true title=data.title content=content permalink=data.url categories=data.categories tags=data.tags timestamp=data.date %}
 {% endfor %}
 </div>
-{% if paginator.total_pages > 1 %}
-	<ul class="pager">
-		{% if paginator.previous_page %}
-		<li class="previous">
-			<a href="{{ paginator.previous_page_path | absolute_url }}">&larr; Newer Posts</a>
-		</li>
-		{% endif %}
-		{% if paginator.next_page %}
-		<li class="next">
-			<a href="{{ paginator.next_page_path | absolute_url }}">Older Posts &rarr;</a>
-		</li>
-		{% endif %}
-	</ul>
-{% endif %}
+{% include pagination.liquid %}
 {% include page_end.liquid %}