diff --git a/config.ini.sample b/config.ini.sample
index 0fdb63f..88e8892 100644
--- a/config.ini.sample
+++ b/config.ini.sample
@@ -1,80 +1,80 @@
 ; SylkServer configuration file
 
 [Server]
 
 ; The following settings are the default used by the software, uncomment
 ; them only if you want to make changes
 
 ; default_application = conference
 
 ; Map user part of the Request URI to a specific application
 ; application_map = 123:conference,test:irc-conference
 
 ; trace_dir = /var/log/sylkserver
 ; trace_sip = False
 ; trace_msrp = False
 ; trace_notifications = False
 
 ; TLS can be used for encryption of SIP signaling and MSRP media. TLS is
 ; disabled by default.  To enable TLS, you must have a valid X.509
 ; certificate and configure it below, then set the local_tls_port in the SIP
 ; section and use_tls in MSRP section
 
 ; The X.509 Certificate Authorities file
 ; ca_file = /etc/sylkserver/tls/ca.crt
 
 ; The file containing X.509 certificate and private key in unencrypted format
 ; certificate = /etc/sylkserver/tls/default.crt
 
 ; verify_server = False
 
 
 [SIP]
 
 ; SIP transport settings
 ; IP address used for SIP signaling; empty string or any means listen on interface used
 ; by the default route
 ; local_ip =
 
 ; Ports used for SIP transports, if not set to any value the transport will be disabled
 ; local_udp_port = 5060
 ; local_tcp_port = 5060
-; local_tls_port =
+; local_tls_port = 5061
 
 ; If set all outbound SIP requests will be sent through this SIP proxy
 ; outbound_proxy =
 
 ; A comma-separated list of hosts or networks to trust.
 ; The elements can be an IP address in CIDR format, a
 ; hostname or an IP address (in the latter 2 a mask of 32
 ; is assumed), or the special keywords 'any' and 'none'
 ; (being equivalent to 0.0.0.0/0 and 0.0.0.0/32
 ; respectively). It defaults to 'any'.
 ; trusted_peers =
 
 
 [MSRP]
 
 ; MSRP transport settings
 
 ; A valid X.509 certificate is required for MSRP to work over TLS.
 ; TLS is enabled by default, a default TLS certificate is provided with SylkServer.
 ; use_tls = True
 
 
 [RTP]
 
 ; RTP transport settings
 
 ; Allowed codec list, valid values: G722, speex, PCMU, PCMA, iLBC, GSM
 ; audio_codecs = G722,speex,PCMU,PCMA
 
 ; Port range used for RTP
 ; port_range = 50000:50500
 
 ; SRTP valid values: disabled, mandatory, optional
 ; srtp_encryption = optional
 
 ; RTP stream timeout, session will be disconnected after this value
 ; timeout = 30
 
diff --git a/sylk/configuration/__init__.py b/sylk/configuration/__init__.py
index ea60954..73fc7b6 100644
--- a/sylk/configuration/__init__.py
+++ b/sylk/configuration/__init__.py
@@ -1,69 +1,69 @@
 # Copyright (C) 2010-2011 AG Projects. See LICENSE for details.
 #
 
 from application.configuration import ConfigSection, ConfigSetting
 from application.configuration.datatypes import NetworkRangeList, StringList
 from application.system import host
 from sipsimple.configuration.datatypes import NonNegativeInteger, SRTPEncryption
 
 from sylk import configuration_filename
 from sylk.configuration.datatypes import AudioCodecs, IPAddress, NillablePath, Path, Port, PortRange, SIPProxyAddress
 from sylk.tls import Certificate, PrivateKey
 
 
 class ServerConfig(ConfigSection):
     __cfgfile__ = configuration_filename
     __section__ = 'Server'
 
     ca_file = ConfigSetting(type=NillablePath, value=NillablePath('/etc/sylkserver/tls/ca.crt'))
     certificate = ConfigSetting(type=NillablePath, value=NillablePath('/etc/sylkserver/tls/default.crt'))
     verify_server = False
     default_application = 'conference'
     application_map = ConfigSetting(type=StringList, value='')
     trace_dir = ConfigSetting(type=Path, value=Path('/var/log/sylkserver'))
     trace_sip = False
     trace_msrp = False
     trace_notifications = False
 
 
 class SIPConfig(ConfigSection):
     __cfgfile__ = configuration_filename
     __section__ = 'SIP'
 
     local_ip = ConfigSetting(type=IPAddress, value=host.default_ip)
     local_udp_port = ConfigSetting(type=Port, value=5060)
     local_tcp_port = ConfigSetting(type=Port, value=5060)
-    local_tls_port = ConfigSetting(type=Port, value=None)
+    local_tls_port = ConfigSetting(type=Port, value=5061)
     outbound_proxy = ConfigSetting(type=SIPProxyAddress, value=None)
     trusted_peers = ConfigSetting(type=NetworkRangeList, value=NetworkRangeList('any'))
 
 
 class MSRPConfig(ConfigSection):
     __cfgfile__ = configuration_filename
     __section__ = 'MSRP'
 
     use_tls = True
 
 
 class RTPConfig(ConfigSection):
     __cfgfile__ = configuration_filename
     __section__ = 'RTP'
 
     audio_codecs = ConfigSetting(type=AudioCodecs, value=None)
     port_range = ConfigSetting(type=PortRange, value=PortRange('50000:50500'))
     srtp_encryption = ConfigSetting(type=SRTPEncryption, value='optional')
     timeout = ConfigSetting(type=NonNegativeInteger, value=30)
 
 
 class ThorNodeConfig(ConfigSection):
     __cfgfile__ = configuration_filename
     __section__ = 'ThorNetwork'
 
     enabled = False
     domain = "sipthor.net"
     multiply = 1000
     certificate = ConfigSetting(type=Certificate, value=None)
     private_key = ConfigSetting(type=PrivateKey, value=None)
     ca = ConfigSetting(type=Certificate, value=None)