diff --git a/lib/functions/dns/function.createDomainZone.php b/lib/functions/dns/function.createDomainZone.php
index 0ddf9e39..aa0b4cc0 100644
--- a/lib/functions/dns/function.createDomainZone.php
+++ b/lib/functions/dns/function.createDomainZone.php
@@ -14,7 +14,7 @@
  * @package Functions
  *
  */
-function createDomainZone($domain_id)
+function createDomainZone($domain_id, $froxlorhostname = false)
 {
 	// get domain-name
 	$dom_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE id = :did");
@@ -78,6 +78,20 @@ function createDomainZone($domain_id)
 		}
 	}
 
+	// additional required records for main-but-subdomain-to
+	$mainbutsub_stmt = Database::prepare("
+		SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "`
+		WHERE `ismainbutsubto` = :domainid
+	");
+	Database::pexecute($mainbutsub_stmt, array(
+		'domainid' => $domain_id
+	));
+
+	while ($mainbutsubtodomain = $mainbutsub_stmt->fetch(PDO::FETCH_ASSOC)) {
+		// Add NS entry for subdomain-records of "main-but-subdomain-to"-domains, they get their own Zone
+		addRequiredEntry(str_replace('.' . $domain['domain'], '', $mainbutsubtodomain['domain']), 'NS', $required_entries);
+	}
+
 	$primary_ns = null;
 	$zonefile = "";
 
@@ -98,12 +112,19 @@ function createDomainZone($domain_id)
 
 		// A / AAAA records
 		if (array_key_exists("A", $required_entries) || array_key_exists("AAAA", $required_entries)) {
-			$result_ip_stmt = Database::prepare("
-				SELECT `p`.`ip` AS `ip`
-				FROM `" . TABLE_PANEL_IPSANDPORTS . "` `p`, `" . TABLE_DOMAINTOIP . "` `di`
-				WHERE `di`.`id_domain` = :domainid AND `p`.`id` = `di`.`id_ipandports`
-				GROUP BY `p`.`ip`;
-			");
+			if ($froxlorhostname) {
+				// use all available IP's for the froxlor-hostname
+				$result_ip_stmt = Database::prepare("
+					SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` GROUP BY `ip`
+				");
+			} else {
+				$result_ip_stmt = Database::prepare("
+					SELECT `p`.`ip` AS `ip`
+					FROM `" . TABLE_PANEL_IPSANDPORTS . "` `p`, `" . TABLE_DOMAINTOIP . "` `di`
+					WHERE `di`.`id_domain` = :domainid AND `p`.`id` = `di`.`id_ipandports`
+					GROUP BY `p`.`ip`;
+				");
+			}
 			Database::pexecute($result_ip_stmt, array(
 				'domainid' => $domain_id
 			));
diff --git a/scripts/jobs/cron_tasks.inc.dns.15.bind.php b/scripts/jobs/cron_tasks.inc.dns.15.bind.php
new file mode 100644
index 00000000..5918266a
--- /dev/null
+++ b/scripts/jobs/cron_tasks.inc.dns.15.bind.php
@@ -0,0 +1,214 @@
+<?php
+if (! defined('MASTER_CRONJOB'))
+	die('You cannot access this file directly!');
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Froxlor team <team@froxlor.org> (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *
+ */
+class bind2
+{
+
+	private $_logger = false;
+
+	private $_ns = array();
+
+	private $_mx = array();
+
+	private $_axfr = array();
+
+	public function __construct($logger)
+	{
+		$this->_logger = $logger;
+
+		if (Settings::Get('system.nameservers') != '') {
+			$nameservers = explode(',', Settings::Get('system.nameservers'));
+			foreach ($nameservers as $nameserver) {
+				$nameserver = trim($nameserver);
+				// DNS servers might be multi homed; allow transfer from all ip
+				// addresses of the DNS server
+				$nameserver_ips = gethostbynamel($nameserver);
+				// append dot to hostname
+				if (substr($nameserver, - 1, 1) != '.') {
+					$nameserver .= '.';
+				}
+				// ignore invalid responses
+				if (! is_array($nameserver_ips)) {
+					// act like gethostbyname() and return unmodified hostname on error
+					$nameserver_ips = array(
+						$nameserver
+					);
+				}
+				$this->_ns[] = array(
+					'hostname' => $nameserver,
+					'ips' => $nameserver_ips
+				);
+			}
+		}
+
+		if (Settings::Get('system.mxservers') != '') {
+			$mxservers = explode(',', Settings::Get('system.mxservers'));
+			foreach ($mxservers as $mxserver) {
+				if (substr($mxserver, - 1, 1) != '.') {
+					$mxserver .= '.';
+				}
+				$this->_mx[] = $mxserver;
+			}
+		}
+
+		// AXFR server #100
+		if (Settings::Get('system.axfrservers') != '') {
+			$axfrservers = explode(',', Settings::Get('system.axfrservers'));
+			foreach ($axfrservers as $axfrserver) {
+				$this->_axfr[] = trim($axfrserver);
+			}
+		}
+	}
+
+	public function writeConfigs()
+	{
+		// tell the world what we are doing
+		$this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Task4 started - Rebuilding froxlor_bind.conf');
+
+		// clean up
+		$this->_cleanZonefiles();
+
+		// check for subfolder in bind-config-directory
+		if (! file_exists(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/'))) {
+			$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
+			safe_exec('mkdir -p ' . escapeshellarg(makeCorrectDir(Settings::Get('system.bindconf_directory') . '/domains/')));
+		}
+
+		// get all Domains
+		$result_domains_stmt = Database::query("
+			SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`zonefile`, `c`.`loginname`, `c`.`guid`
+			FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`)
+			WHERE `d`.`isbinddomain` = '1' ORDER BY `d`.`domain` ASC
+		");
+
+		$domains = $result_domains_stmt->fetchAll(PDO::FETCH_ASSOC);
+
+		// frolxor-hostname (#1090)
+		if (Settings::get('system.dns_createhostnameentry') == 1) {
+			$hostname_arr = array(
+				'id' => 'none',
+				'domain' => Settings::Get('system.hostname'),
+				'isemaildomain' => Settings::Get('system.dns_createmailentry'),
+				'customerid' => 'none',
+				'loginname' => 'froxlor.panel',
+				'bindserial' => date('Ymd') . '00',
+				'dkim' => '0',
+				'iswildcarddomain' => '1',
+				'ismainbutsubto' => '0',
+				'zonefile' => '',
+				'froxlorhost' => '1'
+			);
+			$domains['none'] = $hostname_arr;
+		}
+
+		if (empty($domains)) {
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'No domains found for nameserver-config, skipping...');
+			return;
+		}
+
+		$bindconf_file = '# ' . Settings::Get('system.bindconf_directory') . 'froxlor_bind.conf' . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n\n";
+
+		foreach ($domains as $domain) {
+			// check for system-hostname
+			$isFroxlorHostname = false;
+			if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) {
+				$isFroxlorHostname = true;
+			}
+			// create zone-file
+			$zonefile = createDomainZone($domain, $isFroxlorHostname);
+			$domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone';
+			$zonefile_name = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']);
+			$zonefile_handler = fopen($zonefile_name, 'w');
+			fwrite($zonefile_handler, $zonefile);
+			fclose($zonefile_handler);
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, '`' . $zonefile_name . '` zone written');
+
+			// generate config
+			$bindconf_file .= $this->_generateDomainConfig($domain);
+		}
+
+		// write config
+		$bindconf_file_handler = fopen(makeCorrectFile(Settings::Get('system.bindconf_directory') . '/froxlor_bind.conf'), 'w');
+		fwrite($bindconf_file_handler, $bindconf_file);
+		fclose($bindconf_file_handler);
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written');
+
+		// reload Bind
+		safe_exec(escapeshellcmd(Settings::Get('system.bindreload_command')));
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded');
+	}
+
+	private function _generateDomainConfig($domain = array())
+	{
+		$bindconf_file = '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
+		$bindconf_file .= 'zone "' . $domain['domain'] . '" in {' . "\n";
+		$bindconf_file .= '	type master;' . "\n";
+		$bindconf_file .= '	file "' . makeCorrectFile(Settings::Get('system.bindconf_directory') . '/' . $domain['zonefile']) . '";' . "\n";
+		$bindconf_file .= '	allow-query { any; };' . "\n";
+
+		if (count($this->nameservers) > 0 || count($this->axfrservers) > 0) {
+			// open allow-transfer
+			$bindconf_file .= '	allow-transfer {' . "\n";
+			// put nameservers in allow-transfer
+			if (count($this->nameservers) > 0) {
+				foreach ($this->nameservers as $ns) {
+					foreach ($ns["ips"] as $ip) {
+						$bindconf_file .= '		' . $ip . ";\n";
+					}
+				}
+			}
+			// AXFR server #100
+			if (count($this->axfrservers) > 0) {
+				foreach ($this->axfrservers as $axfrserver) {
+					if (validate_ip($axfrserver, true) !== false) {
+						$bindconf_file .= '		' . $axfrserver . ';' . "\n";
+					}
+				}
+			}
+			// close allow-transfer
+			$bindconf_file .= '	};' . "\n";
+		}
+
+		$bindconf_file .= '};' . "\n";
+		$bindconf_file .= "\n";
+
+		return $bindconf_file;
+	}
+
+	private function _cleanZonefiles()
+	{
+		$config_dir = makeCorrectFile(Settings::Get('system.bindconf_directory') . '/domains/');
+
+		$this->_logger->logAction(CRON_ACTION, LOG_INFO, 'Cleaning dns zone files from '.$config_dir);
+
+		// check directory
+		if (@is_dir($config_dir)) {
+
+			// create directory iterator
+			$its = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config_dir));
+
+			// iterate through all subdirs, look for zone files and delete them
+			foreach ($its as $it) {
+				if ($it->isFile()) {
+					// remove file
+					safe_exec('rm -f ' . escapeshellarg(makeCorrectFile($its->getPathname())));
+				}
+			}
+		}
+	}
+}