diff --git a/branches/ucs-3.2/ucs-3.2-4/services/univention-support-info/univention-support-info b/branches/ucs-3.2/ucs-3.2-4/services/univention-support-info/univention-support-info
index a558464..843b618 100755
--- a/branches/ucs-3.2/ucs-3.2-4/services/univention-support-info/univention-support-info
+++ b/branches/ucs-3.2/ucs-3.2-4/services/univention-support-info/univention-support-info
@@ -300,11 +300,11 @@ def simpleFiles():
 	print 'done.'
 
 def licenseObject():
-	''' Get license object from ldap (cn=license) '''	
+	''' Get license object from ldap (cn=license) '''
 	stdout = executeCommand( 'univention-license-object', (_ldapsearchCommand(), '-x' , '-b', 'cn=license,cn=univention,'+ucr.get('ldap/base')) )
 	addFile('info/univention-license-object', len(stdout), cStringIO.StringIO(stdout))
 
-	
+
 def checkMaintenance():
 	''' Check if UCS-Version is in maintenance '''
 	if ucr.get('version/version') <= '2.3':
@@ -347,7 +347,7 @@ def aptPackageList():
 				print >> packagesUnknownSource, "%s\tUNKNOWN" % (pkg.name,)
 				continue
 			print >> packagesAll, "%s\t%s" % (pkg.name, uri)
-	
+
 	addFile( 'info/packages_all', None, packagesAll )
 	addFile( 'info/packages_unknown-source', None, packagesUnknownSource )
 	print 'done.'
@@ -421,9 +421,9 @@ def collectCommandData():
 				'join-status':
 					('univention-check-join-status', ),
 				'virsh-qemu':
-					('virsh', '-c', 'qemu:///system', 'capabilities', ),
+					('timeout', '-k', '40', '30', 'virsh', '-c', 'qemu:///system', 'capabilities', ),
 				'virsh-xen':
-					('virsh', '-c', 'xen:///',		'capabilities', ),
+					('timeout', '-k', '40', '30', 'virsh', '-c', 'xen+unix:///', 'capabilities', ),
 				'top':
 					('top', '-b', '-n2', ),
 				'testparm':
@@ -434,7 +434,7 @@ def collectCommandData():
 					('/usr/share/univention-directory-listener/get_notifier_id.py', ),
 				'mailq':
 					('mailq', ),
-		   		'univention-license-check':
+				'univention-license-check':
 					('univention-license-check', ),
 				'hostaccount-id':
 					('id', ucr.get('hostname') + '$', ),
@@ -443,7 +443,7 @@ def collectCommandData():
 	# Commands depending on samba version
 	if sambaDomainVersion == 3:
 		commands.update({'test-join':
-							('net', 'rpc', 'testjoin', ),	
+							('net', 'rpc', 'testjoin', ),
 						})
 	elif sambaDomainVersion == 4:
 		commands.update({'net-ads-info':
@@ -586,7 +586,7 @@ def rotatedLogs():
 			fileLinecount = 0
 			if number != -1:
 				path += '.%d' % number
-			
+
 			if gzipped:
 				try:
 					logfile = open(path + GzipSuffix, 'rb')
@@ -657,7 +657,7 @@ def atJobs():
 	jobs = ''
 	for job in at.list( extended=True ):
 		jobs += '\n'.join( (str(job), job.command) )
-	
+
 	addFile('info/at-jobs', len(jobs), cStringIO.StringIO(jobs))
 
 
@@ -811,7 +811,7 @@ def autoupdate():
 	(stdout, stderr) = process.communicate()
 	if not process.returncode:
 		log.info("Starting new script version")
-	 	os.execv(sys.argv[0], sys.argv)
+		os.execv(sys.argv[0], sys.argv)
 
 	if not internet_connection or univention_install_failed:
 		# check if we did not update for some time
@@ -832,7 +832,7 @@ def autoupdate():
 			if answer.lower() in ('n', 'no'):
 				log.info("Ok, stopping as requested.\n")
 				sys.exit(2)
-		
+
 
 def main(encrypt=False):
 	checkForRoot()