diff --git a/README.md b/README.md
index fd0a25f..9c6725d 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ DON'T send any questions, issues or anything related to Flex to my personal emai
 - [Minute read](https://github.com/getpelican/pelican-plugins/tree/master/post_stats)) (new in 2.0)
 - [Related Posts](https://github.com/getpelican/pelican-plugins/tree/master/related_posts)
 - [Representative image](https://github.com/getpelican/pelican-plugins/tree/master/representative_image) (new in 2.2)
+- [Neighbors](https://github.com/getpelican/pelican-plugins/tree/master/neighbors) (new in 2.2)
 
 ## Install
 
diff --git a/static/stylesheet/style.less b/static/stylesheet/style.less
index 0f8722d..2e85900 100644
--- a/static/stylesheet/style.less
+++ b/static/stylesheet/style.less
@@ -138,6 +138,11 @@ main {
     }
   }
 
+  .neighbors {
+    margin: 4% 0% 4% 0%;
+    height: 20px;
+  }
+
   .pagination {
     margin: 4% 8% 4% 8%;
     height: 20px;
diff --git a/templates/article.html b/templates/article.html
index f1e8cb1..080aeb2 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -57,6 +57,8 @@
   </div>
   {% endif %}
 
+  {% include "partial/neighbors.html" %}
+
   {% if article.related_posts %}
   <div class="related-posts">
     <h4>{{ _('You might enjoy') }}</h4>
diff --git a/templates/partial/neighbors.html b/templates/partial/neighbors.html
new file mode 100644
index 0000000..fbbe0a4
--- /dev/null
+++ b/templates/partial/neighbors.html
@@ -0,0 +1,14 @@
+{% if 'neighbors' in PLUGINS %}
+  <div class="neighbors">
+  {% if article.prev_article %}
+    <a class="btn float-left" href="{{ SITEURL }}/{{ article.prev_article.url }}" title="{{ article.prev_article.title }}">
+      <i class="fa fa-angle-left"></i> {{ _('Previous Post') }}
+    </a>
+  {% endif %}
+  {% if article.next_article %}
+    <a class="btn float-right" href="{{ SITEURL }}/{{ article.next_article.url }}" title="{{ article.next_article.title }}">
+      {{ _('Next Post') }} <i class="fa fa-angle-right"></i>
+    </a>
+  {% endif %}
+  </div>
+{% endif %}
diff --git a/tests/pelicanconf.py b/tests/pelicanconf.py
index 86b2f4a..c54426f 100644
--- a/tests/pelicanconf.py
+++ b/tests/pelicanconf.py
@@ -3,10 +3,13 @@
 
 from __future__ import unicode_literals
 
+# Optional 'neighbors' plugin adds previous/next post buttons to articles.
 PLUGIN_PATHS = ['../plugins']
-PLUGINS = ['i18n_subsites']
+PLUGINS = ['i18n_subsites', 'neighbors']
 
-JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n', 'jinja2.ext.autoescape', 'jinja2.ext.with_']}
+JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n',
+                                    'jinja2.ext.autoescape',
+                                    'jinja2.ext.with_']}
 
 AUTHOR = u'Test'
 SITEURL = u'http://localhost:8000'
@@ -54,8 +57,6 @@ CC_LICENSE = {
 
 COPYRIGHT_YEAR = 2016
 
-DEFAULT_PAGINATION = 10
-
 STATUSCAKE = {
     'trackid': 'test-test',
     'days': 7,