diff --git a/lib/msf/core/post/linux/system.rb b/lib/msf/core/post/linux/system.rb
index 8f6a8d25e9..cf0f5ba984 100644
--- a/lib/msf/core/post/linux/system.rb
+++ b/lib/msf/core/post/linux/system.rb
@@ -15,100 +15,80 @@ module System
 		system_data = {}
 		etc_files = cmd_exec("ls /etc").split()
 
+		kernel_version = cmd_exec("uname -a")
+		system_data[:kernel] = kernel_version
+
 		# Debian
 		if etc_files.include?("debian_version")
-			kernel_version = cmd_exec("uname -a")
 			if kernel_version =~ /Ubuntu/
 				version = read_file("/etc/issue").gsub(/\n|\\n|\\l/,'')
 				system_data[:distro] = "ubuntu"
 				system_data[:version] = version
-				system_data[:kernel] = kernel_version
 			else
 				version = read_file("/etc/issue").gsub(/\n|\\n|\\l/,'')
 				system_data[:distro] = "debian"
 				system_data[:version] = version
-				system_data[:kernel] = kernel_version
 			end
 
 		# Amazon
 		elsif etc_files.include?("system-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/system-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "amazon"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Fedora
 		elsif etc_files.include?("fedora-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/fedora-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "fedora"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Oracle Linux
 		elsif etc_files.include?("enterprise-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/enterprise-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "oracle"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# RedHat
 		elsif etc_files.include?("redhat-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/redhat-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "redhat"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Arch
 		elsif etc_files.include?("arch-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/arch-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "arch"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Slackware
 		elsif etc_files.include?("slackware-version")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/slackware-version").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "slackware"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Mandrake
 		elsif etc_files.include?("mandrake-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/mandrake-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "mandrake"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		#SuSE
 		elsif etc_files.include?("SuSE-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/SuSE-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "suse"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 
 		# Gentoo
 		elsif etc_files.include?("gentoo-release")
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/gentoo-release").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "gentoo"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 		else
 
 			# Others
-			kernel_version = cmd_exec("uname -a")
 			version = read_file("/etc/issue").gsub(/\n|\\n|\\l/,'')
 			system_data[:distro] = "linux"
 			system_data[:version] = version
-			system_data[:kernel] = kernel_version
 		end
 		return system_data
 	end