diff --git a/pelican/generators.py b/pelican/generators.py
index d116a28e..0279bda3 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -167,10 +167,14 @@ class ArticlesGenerator(Generator):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
+                dates_paginator = Paginator(dates,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
                           templates['tag'], self.context, tag=tag, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
                           page_name='tag/%s'%tag)
             else:
                 write('tag/%s.html' % tag, templates['tag'], self.context,
@@ -182,10 +186,14 @@ class ArticlesGenerator(Generator):
                 articles_paginator = Paginator(articles,
                                                self.settings.get('DEFAULT_PAGINATION'),
                                                self.settings.get('DEFAULT_ORPHANS'))
+                dates_paginator = Paginator(dates,
+                                            self.settings.get('DEFAULT_PAGINATION'),
+                                            self.settings.get('DEFAULT_ORPHANS'))
                 for page_num in range(articles_paginator.num_pages):
                     write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
                           templates['category'], self.context, category=cat, articles=articles, dates=dates,
                           articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
+                          dates_paginator=dates_paginator, dates_page=dates_paginator.page(page_num+1),
                           page_name='category/%s' % cat)
             else:
                 write('category/%s.html' % cat, templates['category'], self.context,