diff --git a/changelog b/changelog
index e4ffbfec..abbfbeb3 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,4 @@
+ * Rename HTTPS templates to TLS and support KU/EKU extensions needed by OpenVPN
  * Close #93 Default output folder / Improve Portable App usability
  * Improve EC Curve selection for key generation.
  * Close #21 Support for ODBC (MSSQL)
diff --git a/doc/xca-doc.tgz b/doc/xca-doc.tgz
index ee495ddc..2cc8c789 100644
Binary files a/doc/xca-doc.tgz and b/doc/xca-doc.tgz differ
diff --git a/doc/xca.sgml b/doc/xca.sgml
index 3e4f302b..4ccbfa26 100644
--- a/doc/xca.sgml
+++ b/doc/xca.sgml
@@ -1364,7 +1364,7 @@ You may apply the whole template or only the subject or only the extensions.
 
 <p>
 
-Next to the 3 default templates for CA, HTTPS server and client
+Next to the 3 default templates for CA, TLS server and client
 certificates, customized templates may be created. Templates are not signed,
 they are just a collection of common values for different certificates.
 Therefore XCA does not care if any duplicates exist in the list of templates.
@@ -1709,7 +1709,7 @@ certificate.
   <item>Make sure the <bf>Source</bf> tab is showing, clicking it if necessary.
     <itemize>
       <item>At the bottom of the panel, select the template
-            <bf>"&#91;default&#93; HTTPS_server"</bf> (or another suitable
+            <bf>"&#91;default&#93; TLS_server"</bf> (or another suitable
             template, if you have created your own)
             and click the <bf>Apply</bf> button.
 	    This will fill in appropriate values under the <bf>Extensions</bf>,
@@ -1792,7 +1792,7 @@ The values of templates can be applied on the first tab of the
 certificate-generation dialog. It can be selected, whether the subject,
 the extensions or both parts of the template will be applied.
 This way a subject-only template may be defined and later
-applied together with the HTTPS_client or HTTPS_server template.
+applied together with the TLS_client or TLS_server template.
 
 <enum>
   <item>Click on the <bf>Templates</bf> tab.
diff --git a/misc/HTTPS_client.xca b/misc/HTTPS_client.xca
deleted file mode 100644
index 6ec549fb..00000000
Binary files a/misc/HTTPS_client.xca and /dev/null differ
diff --git a/misc/TLS_client.xca b/misc/TLS_client.xca
new file mode 100644
index 00000000..22c5f1e5
Binary files /dev/null and b/misc/TLS_client.xca differ
diff --git a/misc/HTTPS_server.xca b/misc/TLS_server.xca
similarity index 50%
rename from misc/HTTPS_server.xca
rename to misc/TLS_server.xca
index 78ff5cc6..f24123a9 100644
Binary files a/misc/HTTPS_server.xca and b/misc/TLS_server.xca differ
diff --git a/misc/xca.wix b/misc/xca.wix
index 6c0d9a1f..ed116842 100644
--- a/misc/xca.wix
+++ b/misc/xca.wix
@@ -37,8 +37,8 @@
                 <File Id="eku.txt" Source="eku.txt"/>
                 <File Id="oids.txt" Source="oids.txt"/>
                 <File Id="CA.xca" Source="CA.xca"/>
-                <File Id="HTTPS_client.xca" Source="HTTPS_client.xca"/>
-                <File Id="HTTPS_server.xca" Source="HTTPS_server.xca"/>
+                <File Id="TLS_client.xca" Source="TLS_client.xca"/>
+                <File Id="TLS_server.xca" Source="TLS_server.xca"/>
                 <File Id="copyright.txt" Source="copyright.txt"/>
 
             </Component>
diff --git a/xca.pro b/xca.pro
index 7b2e8be4..ac3d0c27 100644
--- a/xca.pro
+++ b/xca.pro
@@ -12,8 +12,12 @@ RC_FILE = img/w32res.rc
 macx {
 	ICON = img/xca-mac-icon.icns
 	CONFIG += release_and_debug
-	XCA_RESOURCES.files = misc/oids.txt misc/CA.xca misc/dn.txt misc/eku.txt misc/HTTPS_client.xca misc/HTTPS_server.xca
-	XCA_RESOURCES.files += lang/xca_de.qm lang/xca_es.qm lang/xca_ru.qm lang/xca_fr.qm lang/xca_hr.qm
+	XCA_RESOURCES.files = misc/oids.txt misc/dn.txt misc/eku.txt
+	XCA_RESOURCES.files += misc/CA.xca misc/TLS_client.xca misc/TLS_server.xca
+	XCA_RESOURCES.files += lang/xca_de.qm lang/xca_es.qm lang/xca_ru.qm lang/xca_fr.qm
+	XCA_RESOURCES.files += lang/xca_hr.qm lang/xca_it.ts lang/xca_ja.ts lang/xca_nl.ts
+	XCA_RESOURCES.files += lang/xca_pl.ts lang/xca_sk.ts lang/xca_tr.ts
+	XCA_RESOURCES.files += lang/xca_zh_CN.ts lang/xca_pt_BR.ts
 	XCA_RESOURCES.path = Contents/Resources
 	QMAKE_BUNDLE_DATA += XCA_RESOURCES
 }