diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3e7c90ec..7f37f46c 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -52,8 +52,6 @@ def run_generators(generators, settings, path, theme, output_path, markup):
     generators = [p(context, settings, path, theme, output_path, markup) 
             for p in generators]
 
-    writer = Writer(output_path)
-
     for p in generators:
         if hasattr(p, 'generate_context'):
             p.generate_context()
@@ -62,6 +60,8 @@ def run_generators(generators, settings, path, theme, output_path, markup):
     if output_path not in os.path.realpath(path):
         clean_output_dir(output_path)
 
+    writer = Writer(output_path)
+
     for p in generators:
         if hasattr(p, 'generate_output'):
             p.generate_output(writer)
diff --git a/setup.py b/setup.py
index be9c0569..d461cb46 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ if sys.version_info < (2,7):
 
 setup(
     name = "pelican",
-    version = '2.5.0',
+    version = '2.5.1',
     url = 'http://alexis.notmyidea.org/pelican/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',