diff -Nur e-smith-ibays-2.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent e-smith-ibays-2.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent
--- e-smith-ibays-2.2.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent	2014-04-17 21:23:03.165419209 +0200
+++ e-smith-ibays-2.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/20IbayContent	2014-05-03 11:22:20.249082740 +0200
@@ -10,9 +10,18 @@
     my $ibay = $virtualHostContent;
     my $basedir = "/home/e-smith/files/ibays/$ibay";
     my $cgiBin = $accounts->get_prop($ibay, "CgiBin") || "";
+    my $ssl_domain = $accounts->get_prop($ibay, 'SSL') || 'disabled';
 
     $OUT .= "    DocumentRoot         $basedir/html\n";
 
+        my $SSLPort = $modSSL{'TCPPort'} || '443';
+        if (( $port ne $SSLPort ) && ( $ssl_domain eq 'enabled'))
+        {
+        my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort";  
+        $OUT .= "    RewriteEngine on\n";
+        $OUT .= "    RewriteRule ^/(/.*|\$) https://%{HTTP_HOST}${portspec}/\$1 [R,L]\n";
+        }
+
     if ($cgiBin)
     {
 	$OUT .= "    ScriptAlias /cgi-bin $basedir/cgi-bin\n";
@@ -45,8 +54,9 @@
 	    my $SSLPort = $modSSL{'TCPPort'} || '443';
 
 	    if (( $port ne $SSLPort ) && (($ibay->prop('SSL') || 'disabled') eq 'enabled')){
+        my $portspec = ($SSLPort eq 443) ? "" : ":$SSLPort";  
 		$OUT .= "    RewriteEngine on\n";
-		$OUT .= "    RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}/$key\$1 \[L,R\]\n";
+		$OUT .= "    RewriteRule ^/$key(/.*|\$) https://%{HTTP_HOST}${portspec}/$key\$1 \[L,R\]\n";
 	    }
 	    if ($cgiBin)
 	    {