diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 0ac770ef93c6..997c998f8ce7 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -6,6 +6,7 @@ CLEANFILES+= ${LOCALES:S/$/.out/g}
 LOCALES=	cs_CZ.ISO_8859-2 \
 		de_DE.DIS_8859-15 \
 		de_DE.ISO_8859-1 \
+		el_GR.ISO_8859-7 \
 		es_ES.DIS_8859-15 \
 		es_ES.ISO_8859-1 \
 		is_IS.DIS_8859-15 \
@@ -49,6 +50,7 @@ all: ${LOCALES:S/$/.out/g}
 cs_CZ.ISO_8859-2.out:	map.ISO_8859-2
 de_DE.DIS_8859-15.out:  map.DIS_8859-15
 de_DE.ISO_8859-1.out:   map.ISO_8859-1
+el_GR.ISO_8859-7.out:   map.ISO_8859-7
 es_ES.DIS_8859-15.out:  map.DIS_8859-15
 es_ES.ISO_8859-1.out:   map.ISO_8859-1
 is_IS.DIS_8859-15.out:  map.DIS_8859-15
diff --git a/share/colldef/el_GR.ISO8859-7.src b/share/colldef/el_GR.ISO8859-7.src
new file mode 100644
index 000000000000..b548b3697865
--- /dev/null
+++ b/share/colldef/el_GR.ISO8859-7.src
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# Greek/ISO 8859-7 (backward compatible with ASCII)
+#
+charmap map.ISO_8859-7
+order \
+# controls
+	<NU>;...;<US>;<PA>;...;<AC>;\
+#
+	<NS>;<SP>;!;\";<<<>;</>/>>;<Nb>;<DO>;<Pd>;%;&;\
+	';\(;\);*;+;<+->;\,;<-->;-;.;/;\
+# digits
+	(0,<12>);1;(2,<2S>);(3,<3S>);4;...;9;\
+#
+	:;\;;\<;=;>;?;<SE>;<Co>;<At>;\
+# capital
+	A;...;Z;\
+	<A%>;<A*>;<B*>;<G*>;<D*>;<E%>;<E*>;<Z*>;<Y%>;\
+	<Y*>;<H*>;<J*>;<I%>;<I*>;<K*>;<L*>;<M*>;<N*>;\
+	<C*>;<O%>;<O*>;<P*>;<R*>;<S*>;<T*>;<V*>;<U%>;\
+	<U*>;<F*>;<X*>;<Q*>;<W%>;<W*>;\
+#
+	[;\\;];<':>;_;<''>;`;\
+# small
+	a;...;z;\
+	<a%>;<a*>;<b*>;<g*>;<d*>;<e%>;<e*>;<z*>;<y%>;\
+	<y*>;<h*>;<i3>;<j*>;<i%>;<i*>;<k*>;<l*>;<m*>;\
+	<n*>;<c*>;<o%>;<p*>;<o*>;<r*>;<s*>;<*s>;<t*>;\
+	<u3>;<v*>;<u%>;<u*>;<f*>;<x*>;<q*>;<w%>;<w*>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<DT>;\
+# remains
+	<'/>>;<9'>;<'9>;<IE>;<DS>;<NJ>;<V%>;<-M>;<'%>;\
+	<v=>;<dz>
diff --git a/share/colldef/el_GR.ISO_8859-7.src b/share/colldef/el_GR.ISO_8859-7.src
new file mode 100644
index 000000000000..b548b3697865
--- /dev/null
+++ b/share/colldef/el_GR.ISO_8859-7.src
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# Greek/ISO 8859-7 (backward compatible with ASCII)
+#
+charmap map.ISO_8859-7
+order \
+# controls
+	<NU>;...;<US>;<PA>;...;<AC>;\
+#
+	<NS>;<SP>;!;\";<<<>;</>/>>;<Nb>;<DO>;<Pd>;%;&;\
+	';\(;\);*;+;<+->;\,;<-->;-;.;/;\
+# digits
+	(0,<12>);1;(2,<2S>);(3,<3S>);4;...;9;\
+#
+	:;\;;\<;=;>;?;<SE>;<Co>;<At>;\
+# capital
+	A;...;Z;\
+	<A%>;<A*>;<B*>;<G*>;<D*>;<E%>;<E*>;<Z*>;<Y%>;\
+	<Y*>;<H*>;<J*>;<I%>;<I*>;<K*>;<L*>;<M*>;<N*>;\
+	<C*>;<O%>;<O*>;<P*>;<R*>;<S*>;<T*>;<V*>;<U%>;\
+	<U*>;<F*>;<X*>;<Q*>;<W%>;<W*>;\
+#
+	[;\\;];<':>;_;<''>;`;\
+# small
+	a;...;z;\
+	<a%>;<a*>;<b*>;<g*>;<d*>;<e%>;<e*>;<z*>;<y%>;\
+	<y*>;<h*>;<i3>;<j*>;<i%>;<i*>;<k*>;<l*>;<m*>;\
+	<n*>;<c*>;<o%>;<p*>;<o*>;<r*>;<s*>;<*s>;<t*>;\
+	<u3>;<v*>;<u%>;<u*>;<f*>;<x*>;<q*>;<w%>;<w*>;\
+#
+	\{;<NO>;|;<BB>;\};~;<.M>;<DG>;<DT>;\
+# remains
+	<'/>>;<9'>;<'9>;<IE>;<DS>;<NJ>;<V%>;<-M>;<'%>;\
+	<v=>;<dz>
diff --git a/share/colldef/map.ISO8859-7 b/share/colldef/map.ISO8859-7
new file mode 100644
index 000000000000..b45066a32b73
--- /dev/null
+++ b/share/colldef/map.ISO8859-7
@@ -0,0 +1,175 @@
+# $FreeBSD$
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \x7d
+'? \x7e
+DT \x7f
+PA \x80
+HO \x81
+BH \x82
+NH \x83
+IN \x84
+NL \x85
+SA \x86
+ES \x87
+HS \x88
+HJ \x89
+VS \x8a
+PD \x8b
+PU \x8c
+RI \x8d
+S2 \x8e
+S3 \x8f
+DC \x90
+P1 \x91
+P2 \x92
+TS \x93
+CC \x94
+MW \x95
+SG \x96
+EG \x97
+SS \x98
+GC \x99
+SC \x9a
+CI \x9b
+ST \x9c
+OC \x9d
+PM \x9e
+AC \x9f
+NS \xa0
+9' \xa1
+'9 \xa2
+Pd \xa3
+IE \xa4
+DS \xa5
+BB \xa6
+SE \xa7
+': \xa8
+Co \xa9
+NJ \xaa
+<< \xab
+NO \xac
+-- \xad
+V% \xae
+-M \xaf
+DG \xb0
++- \xb1
+2S \xb2
+3S \xb3
+'' \xb4
+'% \xb5
+A% \xb6
+.M \xb7
+E% \xb8
+Y% \xb9
+I% \xba
+>> \xbb
+O% \xbc
+12 \xbd
+U% \xbe
+W% \xbf
+i3 \xc0
+A* \xc1
+B* \xc2
+G* \xc3
+D* \xc4
+E* \xc5
+Z* \xc6
+Y* \xc7
+H* \xc8
+I* \xc9
+K* \xca
+L* \xcb
+M* \xcc
+N* \xcd
+C* \xce
+O* \xcf
+P* \xd0
+R* \xd1
+v= \xd2
+S* \xd3
+T* \xd4
+U* \xd5
+F* \xd6
+X* \xd7
+Q* \xd8
+W* \xd9
+J* \xda
+V* \xdb
+a% \xdc
+e% \xdd
+y% \xde
+i% \xdf
+u3 \xe0
+a* \xe1
+b* \xe2
+g* \xe3
+d* \xe4
+e* \xe5
+z* \xe6
+y* \xe7
+h* \xe8
+i* \xe9
+k* \xea
+l* \xeb
+m* \xec
+n* \xed
+c* \xee
+o* \xef
+p* \xf0
+r* \xf1
+*s \xf2
+s* \xf3
+t* \xf4
+u* \xf5
+f* \xf6
+x* \xf7
+q* \xf8
+w* \xf9
+j* \xfa
+v* \xfb
+o% \xfc
+u% \xfd
+w% \xfe
+dz \xff
diff --git a/share/colldef/map.ISO_8859-7 b/share/colldef/map.ISO_8859-7
new file mode 100644
index 000000000000..b45066a32b73
--- /dev/null
+++ b/share/colldef/map.ISO_8859-7
@@ -0,0 +1,175 @@
+# $FreeBSD$
+NU \x00
+SH \x01
+SX \x02
+EX \x03
+ET \x04
+EQ \x05
+AK \x06
+BL \x07
+BS \x08
+HT \x09
+LF \x0a
+VT \x0b
+FF \x0c
+CR \x0d
+SO \x0e
+SI \x0f
+DL \x10
+D1 \x11
+D2 \x12
+D3 \x13
+D4 \x14
+NK \x15
+SY \x16
+EB \x17
+CN \x18
+EM \x19
+SB \x1a
+EC \x1b
+FS \x1c
+GS \x1d
+RS \x1e
+US \x1f
+SP \x20
+Nb \x23
+DO \x24
+At \x40
+<( \x5b
+// \x5c
+)> \x5d
+'> \x5e
+'! \x60
+(! \x7b
+!! \x7c
+!) \x7d
+'? \x7e
+DT \x7f
+PA \x80
+HO \x81
+BH \x82
+NH \x83
+IN \x84
+NL \x85
+SA \x86
+ES \x87
+HS \x88
+HJ \x89
+VS \x8a
+PD \x8b
+PU \x8c
+RI \x8d
+S2 \x8e
+S3 \x8f
+DC \x90
+P1 \x91
+P2 \x92
+TS \x93
+CC \x94
+MW \x95
+SG \x96
+EG \x97
+SS \x98
+GC \x99
+SC \x9a
+CI \x9b
+ST \x9c
+OC \x9d
+PM \x9e
+AC \x9f
+NS \xa0
+9' \xa1
+'9 \xa2
+Pd \xa3
+IE \xa4
+DS \xa5
+BB \xa6
+SE \xa7
+': \xa8
+Co \xa9
+NJ \xaa
+<< \xab
+NO \xac
+-- \xad
+V% \xae
+-M \xaf
+DG \xb0
++- \xb1
+2S \xb2
+3S \xb3
+'' \xb4
+'% \xb5
+A% \xb6
+.M \xb7
+E% \xb8
+Y% \xb9
+I% \xba
+>> \xbb
+O% \xbc
+12 \xbd
+U% \xbe
+W% \xbf
+i3 \xc0
+A* \xc1
+B* \xc2
+G* \xc3
+D* \xc4
+E* \xc5
+Z* \xc6
+Y* \xc7
+H* \xc8
+I* \xc9
+K* \xca
+L* \xcb
+M* \xcc
+N* \xcd
+C* \xce
+O* \xcf
+P* \xd0
+R* \xd1
+v= \xd2
+S* \xd3
+T* \xd4
+U* \xd5
+F* \xd6
+X* \xd7
+Q* \xd8
+W* \xd9
+J* \xda
+V* \xdb
+a% \xdc
+e% \xdd
+y% \xde
+i% \xdf
+u3 \xe0
+a* \xe1
+b* \xe2
+g* \xe3
+d* \xe4
+e* \xe5
+z* \xe6
+y* \xe7
+h* \xe8
+i* \xe9
+k* \xea
+l* \xeb
+m* \xec
+n* \xed
+c* \xee
+o* \xef
+p* \xf0
+r* \xf1
+*s \xf2
+s* \xf3
+t* \xf4
+u* \xf5
+f* \xf6
+x* \xf7
+q* \xf8
+w* \xf9
+j* \xfa
+v* \xfb
+o% \xfc
+u% \xfd
+w% \xfe
+dz \xff