diff --git a/src/common/connection.py b/src/common/connection.py
index f0fd69c18..53b59feaf 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -35,37 +35,39 @@ STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', \
 	'invisible']
 
 distro_info = {
-	'Arch Linux': '/etc/arch-release',\
-	'Aurox Linux': '/etc/aurox-release',\
-	'Conectiva Linux': '/etc/conectiva-release',\
-	'Debian GNU/Linux': '/etc/debian_release',\
-	'Debian GNU/Linux': '/etc/debian_version',\
-	'Fedora Linux': '/etc/fedora-release',\
-	'Gentoo Linux': '/etc/gentoo-release',\
-	'Mandrake Linux': '/etc/mandrake-release',\
-	'Slackware Linux': '/etc/slackware-release',\
-	'Slackware Linux': '/etc/slackware-version',\
-	'Solaris/Sparc': '/etc/release',\
-	'Sun JDS': '/etc/sun-release',\
-	'Novell SUSE Linux': '/etc/SuSE-release',\
-	'PLD Linux': '/etc/pld-release',\
-	'SUSE Linux': '/etc/SuSE-release',\
-	'Yellow Dog Linux': '/etc/yellowdog-release',\
+	'Arch Linux': '/etc/arch-release',
+	'Aurox Linux': '/etc/aurox-release',
+	'Conectiva Linux': '/etc/conectiva-release',
+	'Debian GNU/Linux': '/etc/debian_release',
+	'Debian GNU/Linux': '/etc/debian_version',
+	'Fedora Linux': '/etc/fedora-release',
+	'Gentoo Linux': '/etc/gentoo-release',
+	'Linux from Scratch': '/etc/lfs-release',
+	'Mandrake Linux': '/etc/mandrake-release',
+	'Slackware Linux': '/etc/slackware-release',
+	'Slackware Linux': '/etc/slackware-version',
+	'Solaris/Sparc': '/etc/release',
+	'Sun JDS': '/etc/sun-release',
+	'Novell SUSE Linux': '/etc/SuSE-release',
+	'PLD Linux': '/etc/pld-release',
+	'SUSE Linux': '/etc/SuSE-release',
+	'Yellow Dog Linux': '/etc/yellowdog-release',
 	# many distros use the /etc/redhat-release for compatibility
 	# so Redhat is the last
-	'Redhat Linux': '/etc/redhat-release'\
+	'Redhat Linux': '/etc/redhat-release'
 }
 
 def get_os_info():
 	if os.name == 'nt':
-		win_version = {(1, 4, 0): '95',\
-			(1, 4, 10): '98',\
-			(1, 4, 90): 'ME',\
-			(2, 4, 0): 'NT',\
-			(2, 5, 0): '2000',\
+		win_version = {
+			(1, 4, 0): '95',
+			(1, 4, 10): '98',
+			(1, 4, 90): 'ME',
+			(2, 4, 0): 'NT',
+			(2, 5, 0): '2000',
 			(2, 5, 1): 'XP'
-		}[ os.sys.getwindowsversion()[3],\
-			os.sys.getwindowsversion()[0],\
+		}[	os.sys.getwindowsversion()[3],
+			os.sys.getwindowsversion()[0],
 			os.sys.getwindowsversion()[1] ]
 		return 'Windows' + ' ' + win_version
 	elif os.name =='posix':
@@ -81,19 +83,23 @@ def get_os_info():
 				child_stdin.close()
 				return output
 		# lsb_release executable not available, so parse files
-		for distro in distro_info:
-			path_to_file = distro_info[distro]
+		for distro_name in distro_info:
+			path_to_file = distro_info[distro_name]
 			if os.path.exists(path_to_file):
 				fd = open(path_to_file)
 				text = fd.read().strip()
 				fd.close()
 				if path_to_file.endswith('version'):
-					text = distro + ' ' + text
+					text = distro_name + ' ' + text
+				elif path_to_file.endswith('aurox-release'): # file doesn't have version
+					text = distro_name
+				elif path_to_file.endswith('lfs-release'): # file just has version
+					text = distro_name + ' ' + text
 				return text
 	return ''
 
-class connection:
-	"""connection"""
+class Connection:
+	"""Connection class"""
 	def __init__(self, name):
 		# dict of function to be calledfor each event
 		self.handlers = {'ROSTER': [], 'WARNING': [], 'ERROR': [], 'STATUS': [], \
diff --git a/src/common/optparser.py b/src/common/optparser.py
index ed9233aeb..e6141c67d 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -125,7 +125,7 @@ class OptionsParser:
 		for account in accounts:
 			if not self.tab.has_key(account):
 				continue
-			gajim.connections[account] = connection.connection(account)
+			gajim.connections[account] = connection.Connection(account)
 			gajim.config.add_per('accounts', account)
 			for key in self.tab[account]:	
 				gajim.config.set_per('accounts', account, key, \
diff --git a/src/config.py b/src/config.py
index 3915cc4fb..964ae4ef9 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1138,7 +1138,7 @@ class Account_modification_window:
 			dialogs.Error_dialog(_('An account already has this name'))
 			return
 		gajim.config.add_per('accounts', name)
-		gajim.connections[name] = connection.connection(name)
+		gajim.connections[name] = connection.Connection(name)
 		self.plugin.register_handlers(gajim.connections[name])
 		#if we neeed to register a new account
 		if new_account_checkbutton.get_active():