diff --git a/.gitattributes b/.gitattributes
index a6fead3db8..6018582819 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7131,6 +7131,7 @@ tests/tbs/tb0554.pp svneol=native#text/plain
 tests/tbs/tb0555.pp svneol=native#text/plain
 tests/tbs/tb0556.pp svneol=native#text/plain
 tests/tbs/tb0557.pp svneol=native#text/plain
+tests/tbs/tb0558.pp svneol=native#text/plain
 tests/tbs/tb205.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain
diff --git a/packages/fcl-base/src/gettext.pp b/packages/fcl-base/src/gettext.pp
index 216df55693..e6223125f0 100644
--- a/packages/fcl-base/src/gettext.pp
+++ b/packages/fcl-base/src/gettext.pp
@@ -234,7 +234,7 @@ end;
 {$ifdef windows}
 procedure GetLanguageIDs(var Lang, FallbackLang: string);
 var
-  Buffer: array[1..4] of char;
+  Buffer: array[1..4] of {$ifdef Wince}WideChar{$else}char{$endif};
   Country: string;
   UserLCID: LCID;
 begin
diff --git a/tests/tbs/tb0558.pp b/tests/tbs/tb0558.pp
new file mode 100644
index 0000000000..4f800f6068
--- /dev/null
+++ b/tests/tbs/tb0558.pp
@@ -0,0 +1,10 @@
+{ gettext was crashing under Windows CE. Not crashing should be considered a success }
+
+uses gettext;
+
+var
+  LangDefault, LangFallback: ansistring;
+begin
+  GetLanguageIDs(LangDefault, LangFallback);
+end.
+