diff --git a/CHANGES.txt b/CHANGES.txt
index 36506aae50..ea018af7a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-New in Master
-=============
+New in 6.0.2
+============
 
 Features
 --------
diff --git a/docs/extending.txt b/docs/extending.txt
index 0ee62057a7..035cb48995 100644
--- a/docs/extending.txt
+++ b/docs/extending.txt
@@ -1,7 +1,7 @@
 Extending Nikola
 ================
 
-:Version: 6.0.1
+:Version: 6.0.2
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right
diff --git a/docs/man/nikola.1 b/docs/man/nikola.1
index 13149e2d0a..8515930217 100644
--- a/docs/man/nikola.1
+++ b/docs/man/nikola.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH NIKOLA "1" "September 2013" "nikola 6.0.1" "User Commands"
+.TH NIKOLA "1" "September 2013" "nikola 6.0.2" "User Commands"
 .SH NAME
-nikola \- manual page for nikola 6.0.1
+nikola \- manual page for nikola 6.0.2
 .SH DESCRIPTION
 Nikola is a tool to create static websites and blogs. For full documentation and more information, please visit http://getnikola.com
 .SS "Available commands:"
diff --git a/docs/manual.txt b/docs/manual.txt
index 8ff527d74b..0f17824c09 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -8,7 +8,7 @@
 The Nikola Handbook
 ===================
 
-:Version: 6.0.1
+:Version: 6.0.2
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt
index b5c2f93cf9..b6def7ee23 100644
--- a/docs/social_buttons.txt
+++ b/docs/social_buttons.txt
@@ -8,7 +8,7 @@
 Using Alternative Social Buttons with Nikola
 ============================================
 
-:Version: 6.0.1
+:Version: 6.0.2
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/theming.txt b/docs/theming.txt
index 9d0cf76736..61563ead97 100644
--- a/docs/theming.txt
+++ b/docs/theming.txt
@@ -8,7 +8,7 @@
 Theming Nikola
 ==============
 
-:Version: 6.0.1
+:Version: 6.0.2
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right
diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt
index 2af8abd3eb..d65198ab76 100644
--- a/docs/upgrading-to-v6.txt
+++ b/docs/upgrading-to-v6.txt
@@ -8,7 +8,7 @@
 Upgrading to v6
 ===============
 
-:Version: 6.0.1
+:Version: 6.0.2
 
 Nikola tries fairly hard to be compatible between versions. However, there were
 a few areas which were getting clunky, and needed fxing. So, here's what you may
diff --git a/nikola/__init__.py b/nikola/__init__.py
index 25b0b68b29..41b1d7dc1e 100644
--- a/nikola/__init__.py
+++ b/nikola/__init__.py
@@ -5,4 +5,4 @@
 from .nikola import Nikola  # NOQA
 from . import plugins  # NOQA
 
-__version__ = "6.0.1"
+__version__ = "6.0.2"
diff --git a/setup.py b/setup.py
index bf966d7a1b..367807cbbe 100755
--- a/setup.py
+++ b/setup.py
@@ -207,7 +207,7 @@ def find_package_data(
     return out
 
 setup(name='Nikola',
-      version='6.0.1',
+      version='6.0.2',
       description='Static blog/website generator',
       author='Roberto Alsina and others',
       author_email='ralsina@netmanagers.com.ar',