diff --git a/install/froxlor.sql b/install/froxlor.sql
index 4ebf4ff1..16b52a7d 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -538,7 +538,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'phpconfigs_hidestdsubdomain', '0'),
 	('panel', 'allow_theme_change_admin', '1'),
 	('panel', 'allow_theme_change_customer', '1'),
-	('panel', 'version', '0.9.29.1-dev4');
+	('panel', 'version', '0.9.30-dev1');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index a57aa5b6..e70e807c 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2244,3 +2244,10 @@ if (isFroxlorVersion('0.9.29.1-dev3')) {
 
 	updateToVersion('0.9.29.1-dev4');
 }
+
+if (isFroxlorVersion('0.9.29.1-dev4')) {
+	showUpdateStep("Updating from 0.9.29.1-dev4 to 0.9.30-dev1", true);
+	lastStepStatus(0);
+
+	updateToVersion('0.9.30-dev1');
+}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 09ab2855..ab1194f3 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -74,6 +74,6 @@ define('PACKAGE_LOCKED', 1);
 define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
-$version = '0.9.29.1-dev4';
+$version = '0.9.30-dev1';
 $dbversion = '2';
 $branding = '';
diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
index 0c8a2120..623098ff 100644
--- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
+++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
@@ -34,7 +34,7 @@ class lighttpd
 
 	//	protected
 
-	protected $settings = array(); 
+	protected $settings = array();
 	protected $lighttpd_data = array();
 	protected $needed_htpasswds = array();
 	protected $auth_backend_loaded = false;
@@ -44,7 +44,7 @@ class lighttpd
 	/**
 	 * indicator whether a customer is deactivated or not
 	 * if yes, only the webroot will be generated
-	 * 
+	 *
 	 * @var bool
 	 */
 	private $_deactivated = false;
@@ -150,7 +150,7 @@ class lighttpd
 						'loginname' => 'froxlor.panel',
 						'documentroot' => $mypath
 					);
-	
+
 					$php = new phpinterface($this->getDB(), $this->settings, $domain);
 
 					$this->lighttpd_data[$vhost_filename].= '  fastcgi.server = ( '."\n";
@@ -170,7 +170,7 @@ class lighttpd
 
 				$this->lighttpd_data[$vhost_filename].= '}' . "\n";
 			}
-	
+
 			if ($row_ipsandports['ssl'] == '1') {
 				if ($row_ipsandports['ssl_cert_file'] == '') {
 					$row_ipsandports['ssl_cert_file'] = $this->settings['system']['ssl_cert_file'];
@@ -179,7 +179,7 @@ class lighttpd
 				if ($row_ipsandports['ssl_ca_file'] == '') {
 					$row_ipsandports['ssl_ca_file'] = $this->settings['system']['ssl_ca_file'];
 				}
-				
+
 				if ($row_ipsandports['ssl_cert_file'] != '') {
 					$this->lighttpd_data[$vhost_filename].= 'ssl.engine = "enable"' . "\n";
 					$this->lighttpd_data[$vhost_filename].= 'ssl.pemfile = "' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . '"' . "\n";
@@ -195,7 +195,7 @@ class lighttpd
 			 * if $this->settings['system']['apacheconf_vhost'] is a folder
 			 * refs #70
 			 */
-			$vhosts = $this->createLighttpdHosts($row_ipsandports['ip'], $row_ipsandports['port'], $row_ipsandports['ssl'], $vhost_filename);
+			$vhosts = $this->createLighttpdHosts($row_ipsandports['id'], $row_ipsandports['ssl'], $vhost_filename);
 			if ($vhosts !== null && is_array($vhosts) && isset($vhosts[0])) {
 				// sort vhosts by number (subdomains first!)
 				sort($vhosts);
@@ -204,7 +204,7 @@ class lighttpd
 					$this->lighttpd_data[$vhost_filename].= ' include "'.$vhost.'"'."\n";
 				}
 			}
-			
+
 			$this->lighttpd_data[$vhost_filename].= '}' . "\n";
 		}
 
@@ -454,7 +454,7 @@ class lighttpd
 					$vhost_content.= $this->composePhpOptions($domain);
 					$vhost_content.= $this->getStats($domain);
 
-					$query = "SELECT `default_vhostconf_domain` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".$ipid."';";
+					$query = "SELECT * FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".$ipid."';";
 					$ipandport = $this->db->query_first($query);
 
 					$domain['ip'] = $ipandport['ip'];
diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php
index 3ff6b37c..6879f062 100644
--- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php
+++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php
@@ -397,7 +397,6 @@ class nginx
 			}
 
 			$vhost_content.= "\t" . 'listen ' . $ipport . ($ssl_vhost == true ? ' ssl' : '') . ';' . "\n";
-
 		}
 
 		// get all server-names
@@ -504,8 +503,11 @@ class nginx
 		}
 
 		if ($domain['ssl_cert_file'] != '') {
-			// FIXME ssl on now belongs to the listen block as 'ssl' at the end
-			$sslsettings .= "\t" . 'ssl on;' . "\n";
+			// obsolete: ssl on now belongs to the listen block as 'ssl' at the end
+			//$sslsettings .= "\t" . 'ssl on;' . "\n";
+			$sslsettings .= "\t" . 'ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;' . "\n";
+			$sslsettings .= "\t" . 'ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!CAMELLIA;' . "\n";
+			$sslsettings .= "\t" . 'ssl_prefer_server_ciphers on;' . "\n";
 			$sslsettings .= "\t" . 'ssl_certificate ' . makeCorrectFile($domain['ssl_cert_file']) . ';' . "\n";
 
 			if ($domain['ssl_key_file'] != '') {