diff --git a/CHANGELOG b/CHANGELOG
index f6571d6..1cb7e79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+LuaSec 0.6a
+------------
+TBD
+
 --------------------------------------------------------------------------------
 LuaSec 0.5
 ------------
diff --git a/INSTALL b/INSTALL
index f5181b1..da1ad93 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,9 @@
-LuaSec 0.5
+LuaSec 0.6a
 ------------
 
 * OpenSSL options:
 
-    By default, LuaSec 0.5 includes options for OpenSSL 1.0.1e.
+    By default, LuaSec 0.6a includes options for OpenSSL 1.0.1e.
 
     If you need to generate the options for a different version of OpenSSL:
 
diff --git a/LICENSE b/LICENSE
index 2f164d9..baf4f85 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-LuaSec 0.5 license
-Copyright (C) 2006-2013 Bruno Silvestre, UFG
+LuaSec 0.6a license
+Copyright (C) 2006-2015 Bruno Silvestre, UFG
 
 Permission is hereby granted, free  of charge, to any person obtaining
 a  copy  of this  software  and  associated  documentation files  (the
diff --git a/README.md b/README.md
index 919825a..42718bc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-LuaSec 0.5
+LuaSec 0.6a
 ==========
 
 LuaSec depends  on OpenSSL, and  integrates with LuaSocket to  make it
diff --git a/luasec-0.5-3.rockspec b/luasec-0.6a-1.rockspec
similarity index 98%
rename from luasec-0.5-3.rockspec
rename to luasec-0.6a-1.rockspec
index caa6665..524f96c 100644
--- a/luasec-0.5-3.rockspec
+++ b/luasec-0.6a-1.rockspec
@@ -1,8 +1,8 @@
 package = "LuaSec"
-version = "0.5-3"
+version = "0.6a-1"
 source = {
    url = "git://github.com/brunoos/luasec.git",
-   tag = "luasec-0.5"
+   tag = "luasec-0.6a"
 }
 description = {
    summary = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.",
diff --git a/src/config.h b/src/config.h
index 5b6b47d..cae1165 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,6 +1,6 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/context.c b/src/context.c
index 6a295e1..821b675 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,9 +1,9 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
+ * LuaSec 0.6a
  *
  * Copyright (C) 2014 Kim Alvefur, Paul Aurich, Tobias Markmann, 
  *                    Matthew Wild.
- * Copyright (C) 2006-2014 Bruno Silvestre.
+ * Copyright (C) 2006-2015 Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/context.h b/src/context.h
index 293f615..13fc664 100644
--- a/src/context.h
+++ b/src/context.h
@@ -2,8 +2,8 @@
 #define LSEC_CONTEXT_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ec.h b/src/ec.h
index 921359e..efe5344 100644
--- a/src/ec.h
+++ b/src/ec.h
@@ -1,6 +1,6 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/https.lua b/src/https.lua
index 182877e..1c042c7 100644
--- a/src/https.lua
+++ b/src/https.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------
--- LuaSec 0.5
--- Copyright (C) 2009-2014 PUC-Rio
+-- LuaSec 0.6a
+-- Copyright (C) 2009-2015 PUC-Rio
 --
 -- Author: Pablo Musa
 -- Author: Tomas Guisasola
@@ -18,8 +18,8 @@ local try    = socket.try
 -- Module
 --
 local _M = {
-  _VERSION   = "0.5",
-  _COPYRIGHT = "LuaSec 0.5 - Copyright (C) 2009-2014 PUC-Rio",
+  _VERSION   = "0.6a",
+  _COPYRIGHT = "LuaSec 0.6a - Copyright (C) 2009-2015 PUC-Rio",
   PORT       = 443,
 }
 
diff --git a/src/options.h b/src/options.h
index 57fb934..2301d63 100644
--- a/src/options.h
+++ b/src/options.h
@@ -2,8 +2,8 @@
 #define LSEC_OPTIONS_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/options.lua b/src/options.lua
index 26c49c4..8f98b55 100644
--- a/src/options.lua
+++ b/src/options.lua
@@ -21,8 +21,8 @@ local function generate(options, version)
 #define LSEC_OPTIONS_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ssl.c b/src/ssl.c
index 1780ccc..28a9371 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,9 +1,9 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
+ * LuaSec 0.6a
  *
  * Copyright (C) 2014 Kim Alvefur, Paul Aurich, Tobias Markmann, 
  *                    Matthew Wild.
- * Copyright (C) 2006-2014 Bruno Silvestre.
+ * Copyright (C) 2006-2015 Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
 
@@ -757,7 +757,7 @@ static int meth_getsniname(lua_State *L)
 
 static int meth_copyright(lua_State *L)
 {
-  lua_pushstring(L, "LuaSec 0.5 - Copyright (C) 2006-2011 Bruno Silvestre"
+  lua_pushstring(L, "LuaSec 0.6a - Copyright (C) 2006-2015 Bruno Silvestre, UFG"
 #if defined(WITH_LUASOCKET)
                     "\nLuaSocket 3.0-RC1 - Copyright (C) 2004-2013 Diego Nehab"
 #endif
diff --git a/src/ssl.h b/src/ssl.h
index b357196..f17286b 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -2,8 +2,8 @@
 #define LSEC_SSL_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
- * Copyright (C) 2006-2014 Bruno Silvestre
+ * LuaSec 0.6a
+ * Copyright (C) 2006-2015 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ssl.lua b/src/ssl.lua
index afc40a5..dcb3096 100644
--- a/src/ssl.lua
+++ b/src/ssl.lua
@@ -1,6 +1,6 @@
 ------------------------------------------------------------------------------
--- LuaSec 0.5
--- Copyright (C) 2006-2014 Bruno Silvestre
+-- LuaSec 0.6a
+-- Copyright (C) 2006-2015 Bruno Silvestre
 --
 ------------------------------------------------------------------------------
 
@@ -169,7 +169,7 @@ core.setmethod("info", info)
 --
 
 local _M = {
-  _VERSION        = "0.5",
+  _VERSION        = "0.6a",
   _COPYRIGHT      = core.copyright(),
   loadcertificate = x509.load,
   newcontext      = newcontext,
diff --git a/src/x509.c b/src/x509.c
index fb117b5..6f60fe1 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -1,8 +1,8 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
+ * LuaSec 0.6a
  *
- * Copyright (C) 2014 Kim Alvefur, Paul Aurich, Tobias Markmann
- *                    Matthew Wild, Bruno Silvestre.
+ * Copyright (C) 2014-2015 Kim Alvefur, Paul Aurich, Tobias Markmann
+ *                         Matthew Wild, Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/x509.h b/src/x509.h
index 2b32cdd..2109ad2 100644
--- a/src/x509.h
+++ b/src/x509.h
@@ -1,8 +1,8 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.5
+ * LuaSec 0.6a
  *
- * Copyright (C) 2014 Kim Alvefur, Paul Aurich, Tobias Markmann
- *                    Matthew Wild, Bruno Silvestre.
+ * Copyright (C) 2014-2015 Kim Alvefur, Paul Aurich, Tobias Markmann
+ *                         Matthew Wild, Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/