diff --git a/rtl/emx/sysutils.pp b/rtl/emx/sysutils.pp
index c76aa7bca0..39c6b9852a 100644
--- a/rtl/emx/sysutils.pp
+++ b/rtl/emx/sysutils.pp
@@ -1092,18 +1092,19 @@ begin
     GetEnvironmentVariable := StrPas (GetEnvPChar (EnvVar));
 end;
 
+
 Function GetEnvironmentVariableCount : Integer;
 
 begin
-  // Result:=FPCCountEnvVar(EnvP);
-  Result:=0;
+(*  Result:=FPCCountEnvVar(EnvP); - the amount is already known... *)
+  GetEnvironmentVariableCount := EnvC;
 end;
-  
+
+
 Function GetEnvironmentString(Index : Integer) : String;
-  
+
 begin
-  // Result:=FPCGetEnvStrFromP(Envp,Index);
-  Result:='';
+  Result:=FPCGetEnvStrFromP (EnvP, Index);
 end;
     
 
@@ -1143,7 +1144,7 @@ begin
    SD.Related := ssf_Related_Child;
    SD.PgmName := PChar (Path);
    SD.PgmInputs := PChar (ComLine);
-   Str (ProcessID, SPID);
+   Str (GetProcessID, SPID);
    Str (ThreadID, STID);
    QName := '\QUEUES\FPC_ExecuteProcess_p' + SPID + 't' + STID + '.QUE'#0;
    SD.TermQ := @QName [1];
@@ -1221,7 +1222,10 @@ end.
 
 {
   $Log$
-  Revision 1.17  2004-12-11 11:32:44  michael
+  Revision 1.18  2004-12-11 17:32:34  hajny
+    * GetEnvironmentVariableCount uses EnvC under OS/2 and EMX
+
+  Revision 1.17  2004/12/11 11:32:44  michael
   + Added GetEnvironmentVariableCount and GetEnvironmentString calls
 
   Revision 1.16  2004/02/22 15:01:49  hajny
@@ -1273,4 +1277,4 @@ end.
   Revision 1.1  2002/11/17 16:22:54  hajny
     + RTL for emx target
 
-}
\ No newline at end of file
+}
diff --git a/rtl/os2/sysutils.pp b/rtl/os2/sysutils.pp
index 41e98978e8..4ef4c56757 100644
--- a/rtl/os2/sysutils.pp
+++ b/rtl/os2/sysutils.pp
@@ -875,16 +875,19 @@ begin
     GetEnvironmentVariable := StrPas (GetEnvPChar (EnvVar));
 end;
 
+
 Function GetEnvironmentVariableCount : Integer;
 
 begin
-  Result:=FPCCountEnvVar(EnvP);
+(*  Result:=FPCCountEnvVar(EnvP); - the amount is already known... *)
+  GetEnvironmentVariableCount := EnvC;
 end;
 
+
 Function GetEnvironmentString(Index : Integer) : String;
 
 begin
-  Result:=FPCGetEnvStrFromP(Envp,Index);
+  Result:=FPCGetEnvStrFromP (EnvP, Index);
 end;
 
 
@@ -1030,7 +1033,10 @@ end.
 
 {
   $Log$
-  Revision 1.47  2004-12-11 11:32:44  michael
+  Revision 1.48  2004-12-11 17:32:34  hajny
+    * GetEnvironmentVariableCount uses EnvC under OS/2 and EMX
+
+  Revision 1.47  2004/12/11 11:32:44  michael
   + Added GetEnvironmentVariableCount and GetEnvironmentString calls
 
   Revision 1.46  2004/12/06 22:11:47  hajny
@@ -1132,4 +1138,4 @@ end.
   Revision 1.15  2002/01/25 16:23:03  peter
     * merged filesearch() fix
 
-}
\ No newline at end of file
+}