diff --git a/pelican/processors.py b/pelican/processors.py
index 564978cc..c23af3f5 100644
--- a/pelican/processors.py
+++ b/pelican/processors.py
@@ -106,6 +106,8 @@ class PagesProcessor(Processor):
             if not is_valid_content(page, f):
                 continue
             self.pages.append(page)
+
+        context['PAGES'] = self.pages
         
     def process(self, context, generator):
         templates = generator.get_templates()
diff --git a/pelican/settings.py b/pelican/settings.py
index 814850f8..6c5449d1 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -10,6 +10,7 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'FEED': 'feeds/all.atom.xml',
                    'CATEGORY_FEED': 'feeds/%s.atom.xml',
                    'SITENAME': 'A Pelican Blog',
+                   'DISPLAY_PAGES_ON_MENU': True,
                   }
 
 def read_settings(filename):
diff --git a/pelican/themes/notmyidea/templates/base.html b/pelican/themes/notmyidea/templates/base.html
index f6387ac7..b5a845b3 100644
--- a/pelican/themes/notmyidea/templates/base.html
+++ b/pelican/themes/notmyidea/templates/base.html
@@ -30,9 +30,11 @@
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
-                {% for title, link in PAGES %}
-                    <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
+                {% if DISPLAY_PAGES_ON_MENU %}
+                {% for page in PAGES %}
+                    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
                 {% endfor %}
+                {% endif %}
                 {% for cat, null in categories %}
                     <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
                 {% endfor %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index e4260302..8ed9fe37 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block content %}        
 {% block content_title %}{% endblock %}
+{% if articles %}
 {% for article in articles %}        
     {% if loop.index == 1 %}
         <aside id="featured" class="body"><article>
@@ -49,4 +50,12 @@
 {% endfor %}
 </ol><!-- /#posts-list -->
 </section><!-- /#content -->
+{% else %}
+<section id="content" class="body">    
+<h2>Pages</h2>
+{% for page in PAGES %}
+    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+{% endfor %}
+</section>
+{% endif %}
 {% endblock content %}