diff --git a/branches/ucs-3.0/ucs/base/univention-debmirror/77univention-debmirror.inst b/branches/ucs-3.0/ucs/base/univention-debmirror/77univention-debmirror.inst
index aa45e89..7f9a512 100755
--- a/branches/ucs-3.0/ucs/base/univention-debmirror/77univention-debmirror.inst
+++ b/branches/ucs-3.0/ucs/base/univention-debmirror/77univention-debmirror.inst
@@ -40,9 +40,9 @@ eval "$(univention-config-registry shell)"
 
 if [ -n "$local_repository" ] && [ "$local_repository" = "true" -o "$local_repository" = "True" -o "$local_repository" = "yes" ]; then
 	# Is there already another repository server?
-	target="$(LC_ALL=C host -t CNAME univention-repository.$domainname | sed -ne 's|.* is an alias for ||p' | sed -e 's|\.$||')"
+	target="$(LC_ALL=C host -t "CNAME univention-repository.$domainname" | sed -ne 's|.* is an alias for ||p' | sed -e 's|\.$||')"
 	if [ -z "$target" ]; then
-		target="$(LC_ALL=C host univention-repository.$domainname | sed -ne 's|.* has \(IPv6 \)\?address ||p')"
+		target="$(LC_ALL=C host "univention-repository.$domainname" | sed -ne 's|.* has \(IPv6 \)\?address ||p')"
 	fi
 
 	if [ -n "$target" ]; then
@@ -50,11 +50,11 @@ if [ -n "$local_repository" ] && [ "$local_repository" = "true" -o "$local_repos
 			# univention-repository is a alias for this host
 			true ;
 		else
-			univention-config-registry set repository/mirror/server=univention-repository.$domainname
+			univention-config-registry set repository/mirror/server="univention-repository.$domainname"
 		fi
 	else
 		univention-config-registry set repository/mirror/server=updates.software-univention.de
-		/usr/share/univention-directory-manager-tools/univention-dnsedit "$@" --ignore-exists --stoptls $domainname add cname univention-repository $hostname
+		/usr/share/univention-directory-manager-tools/univention-dnsedit "$@" --ignore-exists --stoptls "$domainname" add cname univention-repository "$hostname"
 	fi
 
 	ucs_addServiceToLocalhost "Repository-Server" "$@" 
diff --git a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update b/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update
index 6cc0737..078be47 100755
--- a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update
+++ b/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update
@@ -58,7 +58,7 @@ _repo_base = os.path.join( _mirror_base, 'mirror', configRegistry.get( 'version/
 
 def copy_repository( options, source, version ):
 	""" Copy packages and scripts belonging to version from source directory into local repository """
-	print >>options.teefile, 'Copying packages. Please be patient ...',
+	print >>options.teefile, 'Please be patient, copying packages ...',
 	sys.stdout.flush()
 
 	version = _exp_version.match( version ).groupdict()
@@ -76,12 +76,14 @@ def copy_repository( options, source, version ):
 	urepo.copy_package_files( source, dest_repo )
 
 	# create Packages files
+	print >>options.teefile, 'Packages ...',
 	urepo.update_indexes( dest_repo )
 
+	print >>options.teefile, 'Scripts ...',
 	for script in ('preup.sh', 'postup.sh'):
 		if os.path.exists(os.path.join(source, script)):
 			shutil.copy2(os.path.join(source, script), os.path.join(dest_repo, 'all', script))
-	print >>sys.stdout
+	print >>options.teefile, 'Done.'
 
 def update_cdrom( options ):
 	""" Copy repository from local DVD or ISO image """