diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f18e1186a188..0526e4123860 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -635,6 +635,8 @@
..
fr_FR.UTF-8
..
+ ga_IE.UTF-8
+ ..
he_IL.UTF-8
..
hi_IN.ISCII-DEV
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 21db46b3b4d4..f8db9608c47b 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -184,6 +184,7 @@ SAME+= en_US.UTF-8 nl_NL.UTF-8
SAME+= en_US.UTF-8 nl_BE.UTF-8
SAME+= en_US.UTF-8 it_IT.UTF-8
SAME+= en_US.UTF-8 it_CH.UTF-8
+SAME+= en_US.UTF-8 ga_IE.UTF-8
SAME+= en_US.UTF-8 fr_FR.UTF-8
SAME+= en_US.UTF-8 fr_CH.UTF-8
SAME+= en_US.UTF-8 fr_BE.UTF-8
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index ab002fc82c92..d4ad9d24a85a 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -82,6 +82,7 @@ SAME+= C.UTF-8 hu_HU.UTF-8
SAME+= C.UTF-8 hr_HR.UTF-8
SAME+= C.UTF-8 hi_IN.UTF-8
SAME+= C.UTF-8 he_IL.UTF-8
+SAME+= C.UTF-8 ga_IE.UTF-8
SAME+= C.UTF-8 fr_FR.UTF-8
SAME+= C.UTF-8 fr_CH.UTF-8
SAME+= C.UTF-8 fr_CA.UTF-8
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index c351c110db01..f209c5951ee8 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -31,7 +31,6 @@ LOCALES+= en_GB.US-ASCII
LOCALES+= en_GB.UTF-8
LOCALES+= en_IE.ISO8859-1
LOCALES+= en_IE.ISO8859-15
-LOCALES+= en_IE.UTF-8
LOCALES+= en_NZ.UTF-8
LOCALES+= en_PH.UTF-8
LOCALES+= en_SG.UTF-8
@@ -47,6 +46,7 @@ LOCALES+= fr_CA.UTF-8
LOCALES+= fr_CH.ISO8859-15
LOCALES+= fr_CH.UTF-8
LOCALES+= fr_FR.UTF-8
+LOCALES+= ga_IE.UTF-8
LOCALES+= he_IL.UTF-8
LOCALES+= hi_IN.ISCII-DEV
LOCALES+= hi_IN.UTF-8
@@ -156,6 +156,7 @@ SAME+= en_CA.UTF-8 en_CA.ISO8859-1
SAME+= en_GB.ISO8859-15 en_GB.ISO8859-1
SAME+= zh_HK.UTF-8 en_HK.UTF-8
SAME+= zh_HK.UTF-8 en_HK.ISO8859-1
+SAME+= ga_IE.UTF-8 en_IE.UTF-8
SAME+= en_NZ.UTF-8 en_NZ.US-ASCII
SAME+= en_NZ.UTF-8 en_NZ.ISO8859-15
SAME+= en_NZ.UTF-8 en_NZ.ISO8859-1
diff --git a/share/monetdef/en_IE.UTF-8.src b/share/monetdef/ga_IE.UTF-8.src
similarity index 100%
rename from share/monetdef/en_IE.UTF-8.src
rename to share/monetdef/ga_IE.UTF-8.src
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 4c0e6d981e75..d58d9f61314e 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -28,6 +28,7 @@ LOCALES+= eu_ES.UTF-8
LOCALES+= fi_FI.ISO8859-15
LOCALES+= fi_FI.UTF-8
LOCALES+= fr_FR.UTF-8
+LOCALES+= ga_IE.UTF-8
LOCALES+= he_IL.UTF-8
LOCALES+= hi_IN.ISCII-DEV
LOCALES+= hi_IN.UTF-8
diff --git a/share/msgdef/ga_IE.UTF-8.src b/share/msgdef/ga_IE.UTF-8.src
new file mode 100644
index 000000000000..ae07e475043b
--- /dev/null
+++ b/share/msgdef/ga_IE.UTF-8.src
@@ -0,0 +1,17 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# yesexpr
+^(([tT]([áÁ])?)|([tT])|([yY]([eE][sS])?)|([yY]))
+#
+# noexpr
+^(([nN]([íÍ][lL])?)|([nN])|([nN]([oO])?)|([nN]))
+#
+# yesstr
+tá:t:TÁ:T:yes:y:YES:Y
+#
+# nostr
+níl:n:NÍL:N:no:n:NO:N
+# EOF
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 6cde18a098f4..f4cff6a90c31 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -105,6 +105,7 @@ SAME+= en_US.UTF-8 ja_JP.UTF-8
SAME+= en_US.UTF-8 ja_JP.SJIS
SAME+= en_US.UTF-8 ja_JP.eucJP
SAME+= en_US.UTF-8 he_IL.UTF-8
+SAME+= en_US.UTF-8 ga_IE.UTF-8
SAME+= en_US.UTF-8 es_MX.UTF-8
SAME+= en_US.UTF-8 es_MX.ISO8859-1
SAME+= en_US.UTF-8 en_US.US-ASCII
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 657a5d6aedc2..345a1eb6ac6c 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -58,6 +58,7 @@ LOCALES+= fr_CH.ISO8859-15
LOCALES+= fr_CH.UTF-8
LOCALES+= fr_FR.ISO8859-15
LOCALES+= fr_FR.UTF-8
+LOCALES+= ga_IE.UTF-8
LOCALES+= he_IL.UTF-8
LOCALES+= hi_IN.ISCII-DEV
LOCALES+= hi_IN.UTF-8
diff --git a/share/timedef/ga_IE.UTF-8.src b/share/timedef/ga_IE.UTF-8.src
new file mode 100644
index 000000000000..e96517942b40
--- /dev/null
+++ b/share/timedef/ga_IE.UTF-8.src
@@ -0,0 +1,83 @@
+#
+# Short month names
+Ean
+Fea
+Már
+Abr
+Bea
+Mei
+Iul
+Lún
+Mnf
+Drf
+Sam
+Nol
+#
+# Long month names (as in a date)
+Mí Eanair
+Mí na Feabhra
+Mí an Mhárta
+Mí Aibreáin
+Mí na Bealtaine
+Mí an Mheithimh
+Mí Iúil
+Mí na Lúnasa
+Mí Meán Fhómhair
+Mí Deireadh Fómhair
+Mí na Samhna
+Mí na Nollag
+#
+# Short weekday names
+Dom
+Lua
+Már
+Céa
+Déa
+Aoi
+Sat
+#
+# Long weekday names
+Dé Domhnaigh
+Dé Luain
+Dé Máirt
+Dé Céadaoin
+Déardaoin
+Dé hAoine
+Dé Sathairn
+#
+# X_fmt
+%H:%M:%S
+#
+# x_fmt
+%d/%m/%Y
+#
+# c_fmt
+%a %e %b %X %Y
+#
+# AM/PM
+r.n.
+i.n.
+#
+# date_fmt
+%a %e %b %Y %X %Z
+#
+# Long month names (without case ending)
+Mí Eanair
+Mí na Feabhra
+Mí an Mhárta
+Mí Aibreáin
+Mí na Bealtaine
+Mí an Mheithimh
+Mí Iúil
+Mí na Lúnasa
+Mí Meán Fhómhair
+Mí Deireadh Fómhair
+Mí na Samhna
+Mí na Nollag
+#
+# md_order
+dm
+#
+# ampm_fmt
+%I:%M:%S %p
+# EOF
diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile
index 7bb234e884d8..492ff714feb7 100644
--- a/tools/tools/locale/Makefile
+++ b/tools/tools/locale/Makefile
@@ -111,7 +111,7 @@ BASE_LOCALES_OF_INTEREST?= \
cs_CZ da_DK de_AT de_CH de_DE el_GR en_AU en_CA \
en_GB en_HK en_IE en_NZ en_PH en_SG en_US en_ZA \
es_AR es_CR es_ES es_MX et_EE eu_ES fi_FI fr_BE \
- fr_CA fr_CH fr_FR he_IL hi_IN hr_HR hu_HU hy_AM \
+ fr_CA fr_CH fr_FR ga_IE he_IL hi_IN hr_HR hu_HU hy_AM \
is_IS it_CH it_IT ja_JP ko_KR lt_LT lv_LV \
nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO \
ru_RU se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR \
diff --git a/tools/tools/locale/etc/charmaps.xml b/tools/tools/locale/etc/charmaps.xml
index f8ff1ced8d54..78a344d6929e 100644
--- a/tools/tools/locale/etc/charmaps.xml
+++ b/tools/tools/locale/etc/charmaps.xml
@@ -93,6 +93,8 @@
+