diff --git a/docs/extending.txt b/docs/extending.txt
index 54406c6ac4..f2995d8bd2 100644
--- a/docs/extending.txt
+++ b/docs/extending.txt
@@ -1,7 +1,7 @@
 Extending Nikola
 ================
 
-:Version: 6.0.0+beta1
+:Version: 6.0.0
 :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 6fde5e3efa..0bdaf53baa 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" "August 2013" "nikola 6.0.0+beta1" "User Commands"
+.TH NIKOLA "1" "September 2013" "nikola 6.0.0" "User Commands"
 .SH NAME
-nikola \- manual page for nikola 6.0.0+beta1
+nikola \- manual page for nikola 6.0.0
 .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 8631e9e3d1..f3c5e1ed6f 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -8,7 +8,7 @@
 The Nikola Handbook
 ===================
 
-:Version: 6.0.0+beta1
+:Version: 6.0.0
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt
index b9152a7885..97b26f36bd 100644
--- a/docs/social_buttons.txt
+++ b/docs/social_buttons.txt
@@ -8,7 +8,7 @@
 Using Alternative Social Buttons with Nikola
 ============================================
 
-:Version: 6.0.0+beta1
+:Version: 6.0.0
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/theming.txt b/docs/theming.txt
index 9b15d3b0bb..94ab2afbe2 100644
--- a/docs/theming.txt
+++ b/docs/theming.txt
@@ -8,7 +8,7 @@
 Theming Nikola
 ==============
 
-:Version: 6.0.0+beta1
+:Version: 6.0.0
 :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 ea170d6fe9..c2d5f33f76 100644
--- a/docs/upgrading-to-v6.txt
+++ b/docs/upgrading-to-v6.txt
@@ -8,7 +8,7 @@
 Upgrading to v6
 ===============
 
-:Version: 6.0.0+beta1
+:Version: 6.0.0
 
 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 28585493fd..d57db34442 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.0+beta1"
+__version__ = "6.0.0"
diff --git a/setup.py b/setup.py
index b164638705..944f1f21a9 100755
--- a/setup.py
+++ b/setup.py
@@ -215,7 +215,7 @@ def find_package_data(
     return out
 
 setup(name='Nikola',
-      version='6.0.0+beta1',
+      version='6.0.0',
       description='Static blog/website generator',
       author='Roberto Alsina and others',
       author_email='ralsina@netmanagers.com.ar',