diff --git a/16x16.fnt b/16x16.fnt
index cf848f9..509d12f 100644
Binary files a/16x16.fnt and b/16x16.fnt differ
diff --git a/Makefile b/Makefile
index f7cea05..16f73e7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ else
 #MKBOOTMSG    = $(BINDIR)mkbootmsg
 MKBOOTMSG    = $(BINDIR)gfxboot-compile
 endif
-KEYMAPCHARS  = $(PRIVBINDIR)keymapchars
+KEYMAPCHARS  =  ./keymapchars
 BFLAGS       = -O -v -L ../..
 INCLUDES     = $(wildcard *.inc)
 # Filter out Arabic, Indic languages, and Thai, which we cannot render, and
diff --git a/keymapchars b/keymapchars
new file mode 100755
index 0000000..04f3828
--- /dev/null
+++ b/keymapchars
@@ -0,0 +1,37 @@
+#! /usr/bin/perl
+
+while(<>) {
+  if(/^\s*\[\s*\S+\s*(\S+)\s*(\S+)\s*(\S+)\s*\]/) {
+    $k{hex $1} = 1;
+    $k{hex $2} = 1;
+    $k{hex $3} = 1;
+  }
+}
+
+delete $k{0};
+
+@f = sort { $a <=> $b } (keys %k);
+
+print "-a ";
+
+for (@f) {
+  if(!defined($i)) {
+    printf "0x%02x", $_;
+    $sep = ',';
+  }
+  elsif($_ == $i + 1) {
+    $sep = '-';
+  }
+  else {
+    printf "-0x%02x", $i if $sep eq '-';
+    printf ",0x%02x", $_;
+    $sep = ',';
+  }
+
+  $i = $_;
+}
+
+printf "-0x%02x", $i if $sep eq '-';
+
+print "\n";
+
diff --git a/langlist b/langlist
index e86ab19..58d9aa2 100644
--- a/langlist
+++ b/langlist
@@ -4,6 +4,7 @@ bs_BA
 cs_CZ
 da_DK
 de_DE
+el_GR
 en_AU
 en_GB
 en_US
diff --git a/langnames.inc b/langnames.inc
index 9731257..805a8cc 100644
--- a/langnames.inc
+++ b/langnames.inc
@@ -5,6 +5,7 @@
   [ "cs_CZ" "cs_CZ" "Čeština (Česká republika)" ]
   [ "da_DK" "da_DK" "Dansk (Danmark)" ]
   [ "de_DE" "de_DE" "Deutsch (Deutschland)" ]
+  [ "el_GR" "el_GR" "Ελληνικά (Ελλάδα)" ]
   [ "en_AU" "en_AU" "English (Australia)" ]
   [ "en_GB" "en_GB" "English (United Kingdom)" ]
   [ "en_US" "en_US" "English (United States)" ]
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 0000000..2af2acc
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,318 @@
+# translation of bootloader.po to Russian
+# LANGUAGE translations for boot loader
+# Copyright (C) 2004 SUSE LINUX AG
+# Copyright (C) 2004 Vdel CREC
+# Andrew Bogatov<bert@bert2.crec.mipt.ru>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bootloader\n"
+"Report-Msgid-Bugs-To:  \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-12-15 11:39+0000\n"
+"Language-Team: Greek <el@li.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-12-16 17:21+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
+
+#. ok button label
+#. txt_ok
+msgid "OK"
+msgstr "Εντάξει"
+
+#. cancel button label
+#. txt_cancel
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#. reboot button label
+#. txt_reboot
+msgid "Reboot"
+msgstr "Επανεκκίνηση"
+
+#. continue button label
+#. txt_continue
+msgid "Continue"
+msgstr "Συνέχεια"
+
+#. txt_bootoptions
+msgid "Boot Options"
+msgstr "Ρυθμίσεις Εκκίνησης"
+
+#. window title for exit dialog
+#. txt_exit_title (see txt_exit_dialog)
+msgid "Exiting..."
+msgstr "Έξοδος..."
+
+#. txt_exit_dialog
+msgid ""
+"You are leaving the graphical boot menu and\n"
+"starting the text mode interface."
+msgstr ""
+"Εγκαταλείπετε το μενού γραφικής εκκίνησης και\n"
+"ξεκινάτε το περιβάλλον κατάστασης κειμένου."
+
+#. txt_help
+msgid "Help"
+msgstr "Βοήθεια"
+
+#. info box title
+#. txt_info_title
+msgid "Boot loader"
+msgstr "Διαχειριστής Εκκίνησης"
+
+#. error box title
+#. txt_error_title
+msgid "I/O error"
+msgstr "Σφάλμα Εισ/Εξ"
+
+#. boot disk change dialog title
+#. txt_change_disk_title
+msgid "Change Boot Disk"
+msgstr "Αλλαγή Δισκέτας Εκκίνησης"
+
+#. txt_insert_disk
+#, c-format
+msgid "Insert boot disk %u."
+msgstr "Παρακαλώ εισάγετε την δισκέτα εκκίνησης %u."
+
+#. txt_insert_disk2
+#, c-format
+msgid ""
+"This is boot disk %u.\n"
+"Insert boot disk %u."
+msgstr ""
+"Αυτή είναι η δισκέτα εκκίνησης %u.\n"
+"Παρακαλώ εισάγετε τη δισκέτα εκκίνησης %u."
+
+#. txt_insert_disk3
+#, c-format
+msgid ""
+"This is not a suitable boot disk.\n"
+"Please insert boot disk %u."
+msgstr ""
+"Αυτός δεν είναι κατάλληλος δίσκος εκκίνησης.\n"
+"Παρακαλώ εισάγετε τη δισκέτα εκκίνησης %u."
+
+
+#. password dialog title
+#. txt_password_title
+msgid "Password"
+msgstr "Κωδικός"
+
+#. Keep the newlines and spaces after ':'!
+#. txt_password
+msgid ""
+"Enter your password:   \n"
+"\n"
+"\n"
+msgstr ""
+"Εισάγετε τον κωδικό σας:   \n"
+"\n"
+"\n"
+
+#. dvd warning title
+#. txt_dvd_warning_title
+msgid "DVD Error"
+msgstr "Σφάλμα DVD"
+
+#. txt_dvd_warning2
+msgid ""
+"This is a two-sided DVD. You have booted from the second side.\n"
+"\n"
+"Turn the DVD over then continue."
+msgstr ""
+"Αυτό είναι ένα DVD δύο όψεων. Έχετε εκκινήσει από τη δεύτερη πλευρά.\n"
+"\n"
+"Γυρίστε το DVD και συνεχίστε."
+
+#. power off dialog title
+#. txt_power_off_title
+msgid "Power Off"
+msgstr "Διακοπή λειτουργίας"
+
+#. txt_power_off
+msgid "Halt the system now?"
+msgstr "Θέλετε να σταματήσετε το σύστημα τώρα?"
+
+#. txt_password
+msgid "Password\n"
+msgstr "ПΚωδικό\n"
+
+#. button label for other/more options
+#. txt_other_options
+msgid "Other Options"
+msgstr "Άλλες Επιλογές"
+
+#. label for language selection
+#. txt_language
+msgid "Locale"
+msgstr "Μικρός λοβός"
+
+#. label for keymap selection
+#. txt_keymap
+msgid "Keymap"
+msgstr "Διάταξη"
+
+#. label for installation mode selection
+#. txt_modes
+msgid "Modes"
+msgstr "Λειτουργίες"
+
+#. label for modes menu
+#. txt_mode_normal
+msgid "Normal"
+msgstr "Κανονικός"
+
+#. label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr "Λειτουργία ειδικών"
+
+#. title for accessibility menu
+#. txt_access
+msgid "Accessibility"
+msgstr "Προσιτότητα"
+
+#. label for accessibility menu
+#. txt_access_none
+msgid "None"
+msgstr "Κανένας"
+
+#. label for accessibility menu
+#. txt_access_v1
+msgid "High Contrast"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_v2
+msgid "Magnifier"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_v3
+msgid "Screen Reader"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_brltty
+msgid "Braille Terminal"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_m1
+msgid "Keyboard Modifiers"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_m2
+msgid "On-Screen Keyboard"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_m3
+msgid "Motor Difficulties - switch devices"
+msgstr ""
+
+#. label for accessibility menu
+#. txt_access_all
+msgid "Everything"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_driverupdates
+msgid "Use driver update disc"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_workstation
+msgid "Install a workstation"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_server
+msgid "Install a server"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_oem
+msgid "OEM install (for manufacturers)"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_lamp
+msgid "Install a LAMP server"
+msgstr ""
+
+#. Installation mode.
+#. txt_menuitem_ltsp
+msgid "Install an LTSP server"
+msgstr "Εγκαταστήστε έναν διακομιστή LTSP"
+
+#. Installation mode.
+#. txt_menuitem_cli
+msgid "Install a command-line system"
+msgstr "Εγκαταστήστε ένα σύστημα γραμμής εντολών"
+
+#. Installation mode.
+#. txt_menuitem_minimal
+msgid "Install a minimal system"
+msgstr "Εγκαταστήστε ένα ελάχιστο σύστημα"
+
+#. Installation mode.
+#. txt_menuitem_minimalvm
+msgid "Install a minimal virtual machine"
+msgstr "Εγκαταστήστε μια ελάχιστη εικονική μηχανή"
+
+#. Boot menu item; a ^ prefix indicates a unique accelerator key.
+#. txt_menuitem_check
+msgid "^Check disc for defects"
+msgstr "^Έλεγχος Μέσου Εγκατάστασης"
+
+#. Boot menu item; a ^ prefix indicates a unique accelerator key.
+#. txt_menuitem_rescue
+msgid "^Rescue a broken system"
+msgstr ""
+
+#. Boot menu item; a ^ prefix indicates a unique accelerator key.
+#. txt_menuitem_memtest
+msgid "Test ^memory"
+msgstr "Έλεγχος ^Μνήμης"
+
+#. Boot menu item; a ^ prefix indicates a unique accelerator key.
+#. txt_menuitem_hd
+msgid "^Boot from first hard disk"
+msgstr "^Εκκίνηση από τον Σκληρό Δίσκο"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr "Μόνο δωρεάν λογισμικό"
+
+#. Boot menu item; a ^ prefix indicates a unique accelerator key.
+#. txt_menuitem_dell_factory_recovery
+msgid "^Dell Automatic Reinstall"
+msgstr "^Αυτόματη επανεγκατάσταση της Dell"
+
+#. txt_resolution
+msgid "Resolution"
+msgstr "Ανάλυση"
+
+#. txt_videodrv
+msgid "Video"
+msgstr "Βίντεο"
+
+#. txt_video_driver_auto
+msgid "Auto"
+msgstr "Αυτο"
+
+#. txt_no_composite
+msgid "No Composite"
+msgstr ""
+
+#. txt_audio
+msgid "Audio"
+msgstr "Ήχος"
diff --git a/timezones.inc b/timezones.inc
index 971bf2b..b9d989c 100644
--- a/timezones.inc
+++ b/timezones.inc
@@ -9,6 +9,7 @@
   [ "cs_CZ" "Europe/Prague" ]
   [ "da_DK" "Europe/Copenhagen" ]
   [ "de_DE" "Europe/Berlin" ]
+  [ "el_GR" "Europe/Athens" ]
   [ "en_AU" "Australia/Canberra" ]
   [ "en_GB" "Europe/London" ]
   [ "en_US" "America/New_York" ]