diff --git a/docs/getting_started.rst b/docs/getting_started.rst
index df3b71d9..a6eaf79b 100644
--- a/docs/getting_started.rst
+++ b/docs/getting_started.rst
@@ -85,3 +85,5 @@ Pages
 If you create a folder named `pages`, all the files in it will be used to
 generate static pages.
 
+Then, use the `DISPLAY_PAGES_ON_MENU` setting, which will add all the pages to 
+the menu.
diff --git a/pelican/generators.py b/pelican/generators.py
index 8ba776ab..11f964fb 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -184,13 +184,13 @@ class PagesGenerator(Generator):
             self.pages.append(page)
 
         self._update_context(('pages', ))
+        self.context['PAGES'] = self.pages
 
     def generate_output(self, writer):
         templates = self.get_templates()
         for page in self.pages:
             writer.write_file('pages/%s' % page.url, templates['page'],
                     self.context, page=page)
-        self._update_context(('pages',))
 
 
 class StaticGenerator(Generator):