diff --git a/packages/postgres/fpmake.pp b/packages/postgres/fpmake.pp
index ff1d52e892..b98837ad1f 100644
--- a/packages/postgres/fpmake.pp
+++ b/packages/postgres/fpmake.pp
@@ -18,7 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');
-    P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes + [os2,emx];
+    P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes;
 
     P.IncludePath.Add('src');
 
diff --git a/packages/sdl/fpmake.pp b/packages/sdl/fpmake.pp
index baf6503a17..dfeacb5162 100644
--- a/packages/sdl/fpmake.pp
+++ b/packages/sdl/fpmake.pp
@@ -23,7 +23,7 @@ begin
     P.Dependencies.Add('pthreads',AllUnixOSes);
     if Defaults.CPU=arm then
        P.OSes := P.OSes - [darwin];
-    P.OSes := P.OSes - [iphonesim];
+    P.OSes := P.OSes - [iphonesim,os2,emx,go32v2,watcom];
 
     T:=P.Targets.AddUnit('logger.pas');
       with T.Dependencies do
diff --git a/packages/sdl/src/sdl.pas b/packages/sdl/src/sdl.pas
index 965a51311e..3425ea3176 100644
--- a/packages/sdl/src/sdl.pas
+++ b/packages/sdl/src/sdl.pas
@@ -297,6 +297,10 @@ uses
   Windows;
 {$ENDIF}
 
+{$IFDEF OS2}
+  doscalls;
+{$ENDIF OS2}
+
 {$IFDEF UNIX}
   {$IFDEF FPC}
   pthreads,
@@ -330,6 +334,10 @@ const
   SDLLibName = 'SDL.dll';
 {$ENDIF}
 
+{$IFDEF OS2}
+  SDLLibName = 'SDL12.dll';
+{$ENDIF OS2}
+
 {$IFDEF UNIX}
 {$IFDEF DARWIN}
   SDLLibName = 'libSDL-1.2.0.dylib';
@@ -4203,6 +4211,10 @@ begin
   Result := libc.getenv(name);  
   {$ENDIF}
 
+  {$ELSE UNIX}
+   {$IFDEF OS2}
+  DosScanEnv (Name, Result);
+   {$ENDIF OS2}
   {$ENDIF}
 
   {$ENDIF}