diff --git a/CHANGELOG b/CHANGELOG
index 49e07cd..512f3b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+LuaSec 0.7alpha
+---------------
+
+
 --------------------------------------------------------------------------------
 LuaSec 0.6
 ------------
diff --git a/INSTALL b/INSTALL
index affefed..b3b9ed1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,9 @@
-LuaSec 0.6
+LuaSec 0.7alpha
 ------------
 
 * OpenSSL options:
 
-    By default, LuaSec 0.6 includes options for OpenSSL 1.0.2f.
+    By default, LuaSec 0.7alpha includes options for OpenSSL 1.1.0f.
 
     If you need to generate the options for a different version of OpenSSL:
 
diff --git a/LICENSE b/LICENSE
index b92b425..8ec9608 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-LuaSec 0.6 license
-Copyright (C) 2006-2015 Bruno Silvestre, UFG
+LuaSec 0.7alpha license
+Copyright (C) 2006-2017 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 dc89cbe..3abe510 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,14 @@
-LuaSec 0.6
-==========
+LuaSec 0.7alpha
+===============
 LuaSec depends  on OpenSSL, and  integrates with LuaSocket to  make it
 easy to add secure connections to any Lua applications or scripts.
 
 Documentation: https://github.com/brunoos/luasec/wiki
 
-This version includes:
+This version:
 
-* Lua 5.2 and 5.3 compatibility
+ * Add compatibility with OpenSSL 1.1.0
 
-* Context module:
-  - Add ctx:checkkey()
+ * Add 'ssl.config' module
 
-* SSL module:
-  - Add conn:sni() and conn:getsniname()
-
-* Context options:
-  - Add "any" protocol ("sslv23" is deprecated)
-
-* HTTPS module:
-  - Using "any" protocol without SSLv2/SSLv3, by default
-
-* X509 module:
-  - Human readable IP address
-  - Add cert:issued()
-  - Add cert:pubkey()
-
-* Some bug fixes
-
-
-********************************************************************************
-
-PS: 10th anniversary! Thanks to everyone who collaborate with LuaSec.
-
-********************************************************************************
+ * TBD
diff --git a/src/compat.h b/src/compat.h
index 1c83c01..0fabead 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,6 +1,7 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7alpha
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/config.c b/src/config.c
index c5b22af..6356ca8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,5 +1,5 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
+ * LuaSec 0.7alpha
  *
  * Copyright (C) 2006-2017 Bruno Silvestre.
  *
diff --git a/src/context.c b/src/context.c
index af996d3..18de6af 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,9 +1,9 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
+ * LuaSec 0.7alpha
  *
- * Copyright (C) 2014-2016 Kim Alvefur, Paul Aurich, Tobias Markmann, 
+ * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann, 
  *                         Matthew Wild.
- * Copyright (C) 2006-2016 Bruno Silvestre.
+ * Copyright (C) 2006-2017 Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/context.h b/src/context.h
index d440f2c..f926f6b 100644
--- a/src/context.h
+++ b/src/context.h
@@ -2,8 +2,9 @@
 #define LSEC_CONTEXT_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ec.h b/src/ec.h
index cbef80a..ffa6120 100644
--- a/src/ec.h
+++ b/src/ec.h
@@ -1,6 +1,7 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7alpha
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/https.lua b/src/https.lua
index 7916851..ea457b9 100644
--- a/src/https.lua
+++ b/src/https.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------
--- LuaSec 0.6
--- Copyright (C) 2009-2016 PUC-Rio
+-- LuaSec 0.7alpha
+-- Copyright (C) 2009-2017 PUC-Rio
 --
 -- Author: Pablo Musa
 -- Author: Tomas Guisasola
@@ -18,8 +18,8 @@ local try    = socket.try
 -- Module
 --
 local _M = {
-  _VERSION   = "0.6",
-  _COPYRIGHT = "LuaSec 0.6 - Copyright (C) 2009-2016 PUC-Rio",
+  _VERSION   = "0.7",
+  _COPYRIGHT = "LuaSec 0.7alpha - Copyright (C) 2009-2017 PUC-Rio",
   PORT       = 443,
 }
 
diff --git a/src/options.h b/src/options.h
index 67e9bb8..b69aa8a 100644
--- a/src/options.h
+++ b/src/options.h
@@ -2,8 +2,9 @@
 #define LSEC_OPTIONS_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7alpha
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
@@ -12,7 +13,7 @@
 /* If you need to generate these options again, see options.lua */
 
 /* 
-  OpenSSL version: OpenSSL 1.0.2f
+  OpenSSL version: OpenSSL 1.1.0f
 */
 
 struct ssl_option_s {
@@ -73,6 +74,9 @@ static ssl_option_t ssl_options[] = {
 #if defined(SSL_OP_NO_COMPRESSION)
   {"no_compression", SSL_OP_NO_COMPRESSION},
 #endif
+#if defined(SSL_OP_NO_DTLS_MASK)
+  {"no_dtls_mask", SSL_OP_NO_DTLS_MASK},
+#endif
 #if defined(SSL_OP_NO_DTLSv1)
   {"no_dtlsv1", SSL_OP_NO_DTLSv1},
 #endif
diff --git a/src/options.lua b/src/options.lua
index 99b17a7..f8c5419 100644
--- a/src/options.lua
+++ b/src/options.lua
@@ -21,8 +21,9 @@ local function generate(options, version)
 #define LSEC_OPTIONS_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7alpha
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ssl.c b/src/ssl.c
index 8526071..0734487 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,9 +1,9 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
+ * LuaSec 0.7alpha
  *
- * Copyright (C) 2014-2016 Kim Alvefur, Paul Aurich, Tobias Markmann, 
+ * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann, 
  *                         Matthew Wild.
- * Copyright (C) 2006-2016 Bruno Silvestre.
+ * Copyright (C) 2006-2017 Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
 
@@ -761,7 +761,7 @@ static int meth_getsniname(lua_State *L)
 
 static int meth_copyright(lua_State *L)
 {
-  lua_pushstring(L, "LuaSec 0.6 - Copyright (C) 2006-2016 Bruno Silvestre, UFG"
+  lua_pushstring(L, "LuaSec 0.7alpha - Copyright (C) 2006-2017 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 12a2a03..b9707d9 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -2,8 +2,9 @@
 #define LSEC_SSL_H
 
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
- * Copyright (C) 2006-2016 Bruno Silvestre
+ * LuaSec 0.7alpha
+ *
+ * Copyright (C) 2006-2017 Bruno Silvestre
  *
  *--------------------------------------------------------------------------*/
 
diff --git a/src/ssl.lua b/src/ssl.lua
index 3035b69..4fde1af 100644
--- a/src/ssl.lua
+++ b/src/ssl.lua
@@ -1,6 +1,7 @@
 ------------------------------------------------------------------------------
--- LuaSec 0.6
--- Copyright (C) 2006-2016 Bruno Silvestre
+-- LuaSec 0.7alpha
+--
+-- Copyright (C) 2006-2017 Bruno Silvestre
 --
 ------------------------------------------------------------------------------
 
@@ -178,7 +179,7 @@ core.setmethod("info", info)
 --
 
 local _M = {
-  _VERSION        = "0.6",
+  _VERSION        = "0.7",
   _COPYRIGHT      = core.copyright(),
   loadcertificate = x509.load,
   newcontext      = newcontext,
diff --git a/src/x509.c b/src/x509.c
index ad4e7c7..7503327 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -1,7 +1,7 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
+ * LuaSec 0.7alpha
  *
- * Copyright (C) 2014-2016 Kim Alvefur, Paul Aurich, Tobias Markmann
+ * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann
  *                         Matthew Wild, Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/
diff --git a/src/x509.h b/src/x509.h
index 302ab1c..74f15ec 100644
--- a/src/x509.h
+++ b/src/x509.h
@@ -1,7 +1,7 @@
 /*--------------------------------------------------------------------------
- * LuaSec 0.6
+ * LuaSec 0.7alpha
  *
- * Copyright (C) 2014-2016 Kim Alvefur, Paul Aurich, Tobias Markmann
+ * Copyright (C) 2014-2017 Kim Alvefur, Paul Aurich, Tobias Markmann
  *                         Matthew Wild, Bruno Silvestre.
  *
  *--------------------------------------------------------------------------*/