diff --git a/install/update.php b/install/update.php
index cae871128b6e40d944ed3e26d824324308cba497..75dede1f6659ac8d24b2e04d0a2ec00e9e35663f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -190,7 +190,7 @@ $do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in
 if($do_backup == 'yes') {
 
 	//* Create the backup directory
-	$backup_path = '/var/backup/ispconfig_'.@date('Y-m-d_H-i');
+	$backup_path = '/var/backup/ispconfig_'.$conf['hostname'].'_'.@date('Y-m-d_H-i');
 	$conf['backup_path'] = $backup_path;
 	exec("mkdir -p $backup_path");
 	exec("chown root:root $backup_path");
diff --git a/interface/web/dns/form/dns_txt.tform.php b/interface/web/dns/form/dns_txt.tform.php
index 01b731a2e4201e86920393d5eb6a98e79ff762fc..3aee920dd9e82f2b1ce433a271a167ecfe29fa58 100644
--- a/interface/web/dns/form/dns_txt.tform.php
+++ b/interface/web/dns/form/dns_txt.tform.php
@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/',
+					'regex' => '/^(\*\.|[a-zA-Z0-9\.\-\_]){0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',