diff --git a/admin_configfiles.php b/admin_configfiles.php
index 5fbe3bda..7aeb89fd 100644
--- a/admin_configfiles.php
+++ b/admin_configfiles.php
@@ -195,6 +195,9 @@ function getCompleteDistroName($cparser)
 {
     // get distro-info
     $dist_display = $cparser->distributionName;
+    if ($cparser->distributionCodename != '') {
+        $dist_display .= " ".$cparser->distributionCodename;
+    }
     if ($cparser->distributionVersion != '') {
         $dist_display .= " (" . $cparser->distributionVersion . ")";
     }
diff --git a/lib/classes/config/class.ConfigParser.php b/lib/classes/config/class.ConfigParser.php
index 50141b84..94d7fdf5 100644
--- a/lib/classes/config/class.ConfigParser.php
+++ b/lib/classes/config/class.ConfigParser.php
@@ -53,6 +53,12 @@ class ConfigParser {
 	 */
 	public $distributionName = '';
 
+	/**
+	 * Codename of the distribution this configuration is for
+	 * @var string
+	 */
+	public $distributionCodename = '';
+
 	/**
 	 * Version of the distribution this configuration is for
 	 * @var string
@@ -99,6 +105,7 @@ class ConfigParser {
 			switch ((string)$key) {
 				case "name": $this->distributionName = (string)$value; break;
 				case "version": $this->distributionVersion = (string)$value; break;
+				case "codename": $this->distributionCodename = (string)$value; break;
 				case "deprecated": (string)$value == 'true' ? $this->deprecated = true : $this->deprecated = false; break;
 			}
 		}
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index fbebdfbd..254cb80f 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Gentoo" version="Base System release 2.2">
+	<distribution name="Gentoo" version="2.2">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index 185490d9..e5b4a1e5 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" version="Precise, 12.04">
+	<distribution name="Ubuntu" codename="Precise" version="12.04">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index dcf06260..409fb4c8 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" version="Trusty, 14.04">
+	<distribution name="Ubuntu" codename="Trusty" version="14.04">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index 7eb9edf4..e8860201 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Debian" version="Wheezy, 7.x">
+	<distribution name="Debian" codename="Wheezy" version="7.x">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">