diff --git a/.gitignore b/.gitignore
index 183bef7..4842a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,19 +22,7 @@
 /ocserv-0.8.8.tar.xz
 /ocserv-0.8.9.tar.xz.sig
 /ocserv-0.8.9.tar.xz
-/ocserv-0.9.0.tar.xz
-/ocserv-0.9.0.tar.xz.sig
-/ocserv-0.9.1.tar.xz.sig
-/ocserv-0.9.1.tar.xz
-/ocserv-0.9.2.tar.xz.sig
-/ocserv-0.9.2.tar.xz
-/ocserv-0.10.0.tar.xz.sig
-/ocserv-0.10.0.tar.xz
-/ocserv-0.10.1.tar.xz.sig
-/ocserv-0.10.1.tar.xz
-/ocserv-0.10.2.tar.xz.sig
 /ocserv-0.10.2.tar.xz
-/ocserv-0.10.4.tar.xz.sig
-/ocserv-0.10.4.tar.xz
-/ocserv-0.10.5.tar.xz.sig
-/ocserv-0.10.5.tar.xz
+/ocserv-0.10.2.tar.xz.sig
+/ocserv-0.10.6.tar.xz
+/ocserv-0.10.6.tar.xz.sig
diff --git a/ocserv.conf b/ocserv.conf
index 035d9ba..6f64efa 100644
--- a/ocserv.conf
+++ b/ocserv.conf
@@ -43,8 +43,8 @@ auth = "pam"
 # Specify alternative authentication methods that are sufficient
 # for authentication. That is, if set, any of the methods enabled
 # will be sufficient to login.
-#enable-auth = certificate
-#enable-auth = gssapi
+#enable-auth = "certificate"
+#enable-auth = "gssapi"
 #enable-auth = "gssapi[keytab=/etc/key.tab,require-local-user-map=true,tgt-freshness-time=900]"
 
 # Accounting methods available:
@@ -178,12 +178,21 @@ server-key = /etc/pki/ocserv/private/server.key
 # Make sure that you replace the following file in an atomic way.
 #ocsp-response = /path/to/ocsp.der
 
-# In case PKCS #11 or TPM keys are used the PINs should be available
+# In case PKCS #11, TPM or encrypted keys are used the PINs should be available
 # in files. The srk-pin-file is applicable to TPM keys only, and is the 
 # storage root key.
 #pin-file = /path/to/pin.txt
 #srk-pin-file = /path/to/srkpin.txt
 
+# The password or PIN needed to unlock the key in server-key file.
+# Only needed if the file is encrypted or a PKCS #11 object. This
+# is an alternative method to pin-file.
+#key-pin = 1234
+
+# The SRK PIN for TPM.
+# This is an alternative method to srk-pin-file.
+#srk-pin = 1234
+
 # The Certificate Authority that will be used to verify
 # client certificates (public keys) if certificate authentication
 # is set.
diff --git a/ocserv.spec b/ocserv.spec
index 855317d..8364436 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:		ocserv
-Version:	0.10.5
-Release:	2%{?dist}
+Version:	0.10.6
+Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
 # For a breakdown of the licensing, see PACKAGE-LICENSING 
@@ -156,6 +156,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Thu Jul  2 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.10.6-1
+- new upstream release (#1238499)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 30c22ea..1496e43 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7396cedfa7071a4c6d5d243435ce663c  ocserv-0.10.5.tar.xz.sig
-17ee861f352d6ef7cd33114819b215ba  ocserv-0.10.5.tar.xz
+b99c74b781a180348f3a3240940fc838  ocserv-0.10.6.tar.xz
+1cc410cd9ccaa796f36180d10bdeb3a7  ocserv-0.10.6.tar.xz.sig