diff -Nur smeserver-openvpn-s2s-0.2/root/etc/e-smith/templates/etc/openvpn/s2s/openvpn-s2s.conf/30key smeserver-openvpn-s2s-0.2_tls_remote/root/etc/e-smith/templates/etc/openvpn/s2s/openvpn-s2s.conf/30key
--- smeserver-openvpn-s2s-0.2/root/etc/e-smith/templates/etc/openvpn/s2s/openvpn-s2s.conf/30key	2013-11-11 18:33:06.000000000 +0100
+++ smeserver-openvpn-s2s-0.2_tls_remote/root/etc/e-smith/templates/etc/openvpn/s2s/openvpn-s2s.conf/30key	2013-11-14 18:48:49.186448285 +0100
@@ -22,7 +22,7 @@
            if ( -e "/etc/openvpn/s2s/pub/$key".'_cacrl.pem' ) &&
               ( ! -z "/etc/openvpn/s2s/pub/$key".'_cacrl.pem' );
         $OUT .= "ns-cert-type client\n" if ($checkcrt eq 'enabled');
-        $OUT .= "tls-remote $tlsremote\n" if ($tlsremote ne '');
+        $OUT .= "verify-x509-name $tlsremote name\n" if ($tlsremote ne '');
     }
     else{
         $OUT .= "tls-client\n";
@@ -36,7 +36,7 @@
            if ( -e "/etc/openvpn/s2s/pub/$key".'_cacrl.pem' ) &&
               ( ! -z "/etc/openvpn/s2s/pub/$key".'_cacrl.pem' );
         $OUT .= "ns-cert-type server\n" if ($checkcrt eq 'enabled');
-        $OUT .= "tls-remote $tlsremote\n" if ($tlsremote ne '');
+        $OUT .= "verify-x509-name $tlsremote name\n" if ($tlsremote ne '');
     }
 }