diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 71a62ef8a..270e78b1d 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -28,6 +28,7 @@ define('MDATA_KEY_YEAR', 'year');
 define('MDATA_KEY_BPM', 'bpm');
 define('MDATA_KEY_TRACKNUMBER', 'track_number');
 define('MDATA_KEY_CONDUCTOR', 'conductor');
+define('MDATA_KEY_LANGUAGE', 'language');
 
 define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
 define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 14ff80484..5e9b5969b 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -101,34 +101,41 @@ class Application_Form_EditAudioMD extends Zend_Form
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add bmp field
         $this->addElement('text', 'bpm', array(
             'label'      => 'BPM:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add copyright field
         $this->addElement('text', 'copyright', array(
             'label'      => 'Copyright:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add isrc number field
         $this->addElement('text', 'isrc_number', array(
             'label'      => 'ISRC Number:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
-        // Add mood field
+        // Add website field
         $this->addElement('text', 'info_url', array(
             'label'      => 'Website:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
+        // Add language field
+        $this->addElement('text', 'language', array(
+            'label'      => 'Language:',
+            'class'      => 'input_text',
+            'filters'    => array('StringTrim')
+        ));
+
 		// Add the submit button
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 156439f19..922856feb 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -40,7 +40,8 @@ class StoredFile {
         "sample_rate" => "DbSampleRate",
         "mime" => "DbMime",
         "md5" => "DbMd5",
-        "ftype" => "DbFtype"
+        "ftype" => "DbFtype",
+        "language" => "DbLanguage"
     );
 
     public function __construct()
@@ -819,7 +820,7 @@ class StoredFile {
         $r = @copy($audio_file, $audio_stor);*/
 
     }
-    
+
     public static function copyFileToStor($p_targetDir, $fileName){
         $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
 
@@ -834,7 +835,7 @@ class StoredFile {
                 die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
             }
         }
-        
+
         $storDir = MusicDir::getStorDir();
         $stor = $storDir->getDirectory();