diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf
index 20dc160e7a..dfca56bb37 100644
--- a/src/cloud/occi/etc/occi-server.conf
+++ b/src/cloud/occi/etc/occi-server.conf
@@ -9,6 +9,9 @@ ONE_XMLRPC=http://localhost:2633/RPC2
 SERVER=<FQDN OF OCCI SERVER>
 PORT=4567
 
+# SSL proxy that serves the API (set if is being used)
+#SSL_SERVER=https://localhost:443
+
 # Configuration for the image repository
 DATABASE=<ONELOCATION>/var/occi.db
 IMAGE_DIR=<PATH TO EXISTING IMAGE DIRECTORY>
diff --git a/src/cloud/occi/lib/OCCIServer.rb b/src/cloud/occi/lib/OCCIServer.rb
index 11e5abfd4e..bb92c9e7e3 100755
--- a/src/cloud/occi/lib/OCCIServer.rb
+++ b/src/cloud/occi/lib/OCCIServer.rb
@@ -48,7 +48,13 @@ class OCCIServer < CloudServer
         super(config_file)
         
         @config.add_configuration_value("TEMPLATE_LOCATION",template)
-        @base_url="http://#{@config[:server]}:#{@config[:port]}"
+        
+        if @config[:ssl_server]
+            @base_url=@config[:ssl_server]
+        else
+            @base_url="http://#{@config[:server]}:#{@config[:port]}"
+        end
+        
         print_configuration
     end