diff --git a/packages/dblib/fpmake.pp b/packages/dblib/fpmake.pp
index 35b7e01f5a..2ced46db6c 100644
--- a/packages/dblib/fpmake.pp
+++ b/packages/dblib/fpmake.pp
@@ -4,20 +4,13 @@ program fpmake;
 
 uses {$ifdef unix}cthreads,{$endif} fpmkunit;
 
-{$endif not ALLPACKAGES}
-
-procedure add_dblib(const ADirectory: string);
-
-Const
-  DBLibOSes         = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android,dragonfly,beos];
-
 Var
   P : TPackage;
   T : TTarget;
-  
 begin
   With Installer do
     begin
+{$endif ALLPACKAGES}
       P:=AddPackage('dblib');
       P.ShortName := 'dblb';
       P.Directory:=ADirectory;
@@ -32,20 +25,16 @@ begin
       P.SourcePath.Add('src');
       P.IncludePath.Add('src');
 
-      P.OSes := DBLibOSes;
+      P.OSes := [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android,dragonfly,beos];
       if Defaults.CPU=jvm then
         P.OSes := P.OSes - [android];
 
-      T:=P.Targets.AddUnit('dblib.pp',DBLibOSes);
+      T:=P.Targets.AddUnit('dblib.pp',P.OSes);
 
-    P.NamespaceMap:='namespaces.lst';
-    
-    end;
-end;
+      P.NamespaceMap:='namespaces.lst';
 
 {$ifndef ALLPACKAGES}
-begin
-  add_dblib('');
-  Installer.Run;
+      Run;
+    end;
 end.
 {$endif ALLPACKAGES}
diff --git a/packages/fpmake_proc.inc b/packages/fpmake_proc.inc
index 9986c99923..c355c25477 100644
--- a/packages/fpmake_proc.inc
+++ b/packages/fpmake_proc.inc
@@ -64,7 +64,11 @@ begin
 {$include cocoaint/fpmake.pp}
 end;
 
+procedure add_dblib(const ADirectory: string);
+begin
+  with Installer do
 {$include dblib/fpmake.pp}
+end;
 
 procedure add_dbus(const ADirectory: string);
 begin