diff --git a/config/tool_shed.ini.sample b/config/tool_shed.ini.sample
index c4736375d58..309be27ea61 100644
--- a/config/tool_shed.ini.sample
+++ b/config/tool_shed.ini.sample
@@ -138,6 +138,16 @@ require_login = False
 #smtp_server = smtp.your_tool_shed_server
 #email_from = your_tool_shed_email@server
 
+# If your SMTP server requires a username and password, you can provide them
+# here (password in cleartext here, but if your server supports STARTTLS it
+# will be sent over the network encrypted).
+#smtp_username = None
+#smtp_password = None
+
+# If your SMTP server requires SSL from the beginning of the connection
+# smtp_ssl = False
+
+
 # The URL linked by the "Support" link in the "Help" menu.
 #support_url = https://wiki.galaxyproject.org/Support
 
diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py
index 44c492482ee..c4feb367c42 100644
--- a/lib/galaxy/webapps/tool_shed/config.py
+++ b/lib/galaxy/webapps/tool_shed/config.py
@@ -107,6 +107,7 @@ class Configuration( object ):
         self.smtp_server = kwargs.get( 'smtp_server', None )
         self.smtp_username = kwargs.get( 'smtp_username', None )
         self.smtp_password = kwargs.get( 'smtp_password', None )
+        self.smtp_ssl = kwargs.get( 'smtp_ssl', None )
         self.start_job_runners = kwargs.get( 'start_job_runners', None )
         self.email_from = kwargs.get( 'email_from', None )
         self.nginx_upload_path = kwargs.get( 'nginx_upload_path', False )