diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index 0923d60a3..94e1de23e 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -336,5 +336,6 @@ INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pl_PL', 'Polski');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pt_BR', 'Português Brasileiro');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('el_GR', 'Ελληνικά');
 
 -- end of added in 2.3
diff --git a/airtime_mvc/public/js/datatables/i18n/el_GR.txt b/airtime_mvc/public/js/datatables/i18n/el_GR.txt
new file mode 100644
index 000000000..03f52058f
--- /dev/null
+++ b/airtime_mvc/public/js/datatables/i18n/el_GR.txt
@@ -0,0 +1,18 @@
+// Greek
+{
+    "sProcessing":   "Επεξεργασία...",
+    "sLengthMenu":   "Δείξε _MENU_ εγγραφές",
+    "sZeroRecords":  "Δεν βρέθηκαν εγγραφές που να ταιριάζουν",
+    "sInfo":         "Δείχνοντας _START_ εως _END_ από _TOTAL_ εγγραφές",
+    "sInfoEmpty":    "Δείχνοντας 0 εως 0 από 0 εγγραφές",
+    "sInfoFiltered": "(φιλτραρισμένες από _MAX_ συνολικά εγγραφές)",
+    "sInfoPostFix":  "",
+    "sSearch":       "",
+    "sUrl":          "",
+    "oPaginate": {
+        "sFirst":    "Πρώτη",
+        "sPrevious": "Προηγούμενη",
+        "sNext":     "Επόμενη",
+        "sLast":     "Τελευταία"
+    }
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/js/plupload/i18n/el_GR.js b/airtime_mvc/public/js/plupload/i18n/el_GR.js
new file mode 100644
index 000000000..1652d739d
--- /dev/null
+++ b/airtime_mvc/public/js/plupload/i18n/el_GR.js
@@ -0,0 +1,27 @@
+//Greek
+plupload.addI18n({
+    'Select files' : $.i18n._('Select files'),
+    'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
+    'Filename' : $.i18n._('Filename'),
+    'Status' : $.i18n._('Status'),
+    'Size' : $.i18n._('Size'),
+    'Add files' : $.i18n._('Add files'),
+    'Stop current upload' : $.i18n._('Stop current upload'),
+    'Start uploading queue' : $.i18n._('Start uploading queue'),
+    'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
+    'N/A' : $.i18n._('N/A'),
+    'Drag files here.' : $.i18n._('Drag files here.'),
+    'File extension error.': $.i18n._('File extension error.'),
+    'File size error.': $.i18n._('File size error.'),
+    'Init error.': $.i18n._('Init error.'),
+    'HTTP Error.': $.i18n._('HTTP Error.'),
+    'Security error.': $.i18n._('Security error.'),
+    'Generic error.': $.i18n._('Generic error.'),
+    'IO error.': $.i18n._('IO error.'),
+    'Stop Upload': $.i18n._('Stop Upload'),
+    'Add Files': $.i18n._('Add Files'),
+    'Start Upload': $.i18n._('Start Upload'),
+    'Start upload': $.i18n._('Start upload'),
+    '%d files queued': $.i18n._('%d files queued'),
+    "Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
+});
diff --git a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
index 3593384ed..5ef1a1612 100644
--- a/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
@@ -41,3 +41,4 @@ INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pl_PL', 'Polski');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pt_BR', 'Português Brasileiro');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский');
 INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文');
+INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('el_GR', 'Ελληνικά');