diff --git a/_modules/artifactory_repo.py b/_modules/artifactory_repo.py
index 674d0fc..2efa12b 100644
--- a/_modules/artifactory_repo.py
+++ b/_modules/artifactory_repo.py
@@ -217,7 +217,7 @@
     Set up artifactory credentials
 
     '''
-   
+
     prefix = "artifactory"
 
     # look in connection_args first, then default to config file
@@ -226,7 +226,7 @@
             __salt__['config.get'](prefix, {})).get(key, default)
 
     client_config = {
-      'artifactory_url': 'http://%s:%s/artifactory/api' % (get('host', 'localhost'), get('port', '8080'))
+      'artifactory_url': '%s://%s:%s/artifactory/api' % (get('proto', 'http'), get('host', 'localhost'), get('port', '8080'))
     }
 
     user = get('user', False)
@@ -235,7 +235,7 @@
       client_config['username'] = user
       client_config['password'] = password
 
-    artifactory_client = ArtifactoryClient(client_config) 
+    artifactory_client = ArtifactoryClient(client_config)
 
     return artifactory_client
 
@@ -300,7 +300,7 @@
     .. code-block:: bash
 
         salt '*' artifactory_repo.repo_create projectname remote generic
-    
+
     '''
     ret = {}
 
diff --git a/artifactory/files/_artifactory.conf b/artifactory/files/_artifactory.conf
index 776bf37..d9457ec 100644
--- a/artifactory/files/_artifactory.conf
+++ b/artifactory/files/_artifactory.conf
@@ -2,6 +2,7 @@
 artifactory:
   host: {{ client.server.host }}
   port: {{ client.server.port }}
+  proto: {{ client.server.proto|default('http') }}
   {%- if client.server.user is defined %}
   user: {{ client.server.user }}
   password: {{ client.server.password }}