diff --git a/Makefile.PL b/Makefile.PL
index 4c52f0e04e..ad98d8b6d3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -535,7 +535,7 @@ my %valid_config_values = (
   'DB_USE_TLS' => {'yes', 'no'},
   'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 },
   'ZEBRA_MARC_FORMAT' => { 'marc21' => 1, 'normarc' => 1, 'unimarc' => 1 }, # FIXME should generate from contents of distributation
-  'ZEBRA_LANGUAGE'    => { 'cs' => 1, 'en' => 1, 'es' => 1, 'fr' => 1, 'gr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
+  'ZEBRA_LANGUAGE'    => { 'cs' => 1, 'el' => 1, 'en' => 1, 'es' => 1, 'fr' => 1, 'nb' => 1, 'ru' => 1, 'uk' => 1 }, # FIXME should generate from contents of distribution
   'ZEBRA_TOKENIZER' => { chr => 1, icu => 1 },
   'RUN_DATABASE_TESTS' => { 'yes' => 1, 'no' => 1 },
   'USE_MEMCACHED'      => { 'yes' => 1, 'no' => 1 },
diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index c5be386648..f37eb206cd 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -26,7 +26,7 @@
       <command>koha-create</command>
       <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
       <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
-      <arg><option>--zebralang</option> en|es|fr|gr|nb|ru|uk</arg>
+      <arg><option>--zebralang</option> el|en|es|fr|nb|ru|uk</arg>
       <arg><option>--memcached-servers</option> server:port</arg>
       <arg><option>--memcached-prefix</option> namespace_prefix</arg>
       <arg><option>--elasticsearch-server</option> server:port</arg>
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index a4f1220dfc..43d58fd2b5 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -52,7 +52,7 @@ Options:
   --marcflavor flavor       Set the MARC flavor. Valid values are marc21 (default),
                             normarc and unimarc.
   --zebralang lang          Choose the primary language for Zebra indexing. Valid
-                            values are cs, en (default), es, fr, gr, nb, ru and uk.
+                            values are cs, el, en (default), es, fr, nb, ru and uk.
   --elasticsearch-server s  Enforce the use of the specified Elasticsearch server(s)
                             (default: localhost:9200).
   --memcached-servers str   Set a comma-separated list of host:port memcached servers.
diff --git a/debian/templates/koha-sites.conf b/debian/templates/koha-sites.conf
index 3be4c55d73..23ec0a5303 100644
--- a/debian/templates/koha-sites.conf
+++ b/debian/templates/koha-sites.conf
@@ -28,7 +28,7 @@ DEFAULTSQL=""
 # default: 'marc21'
 ZEBRA_MARC_FORMAT="marc21"
 
-# ZEBRA_LANGUAGE: 'cs' | 'en' | 'es' | 'fr' | 'gr' | 'nb' | 'ru' | 'uk'
+# ZEBRA_LANGUAGE: 'cs' | 'el' | 'en' | 'es' | 'fr' | 'nb' | 'ru' | 'uk'
 # Primary language for Zebra indexing
 # default: 'en'
 ZEBRA_LANGUAGE="en"
diff --git a/etc/zebradb/lang_defs/gr/sort-string-utf.chr b/etc/zebradb/lang_defs/el/sort-string-utf.chr
similarity index 100%
rename from etc/zebradb/lang_defs/gr/sort-string-utf.chr
rename to etc/zebradb/lang_defs/el/sort-string-utf.chr