diff --git a/fpmake.pp b/fpmake.pp
index 443a1c4bba3..d5f46a979fd 100644
--- a/fpmake.pp
+++ b/fpmake.pp
@@ -47,6 +47,7 @@ procedure add_fpc(const ADirectory: string);
 end;
 
 begin
+  add_packages_comandlineoptions();
   add_fpc('');
   Installer.Run;
 end.
diff --git a/packages/fpmake.pp b/packages/fpmake.pp
index 634f2534314..4b27160b08c 100644
--- a/packages/fpmake.pp
+++ b/packages/fpmake.pp
@@ -24,11 +24,16 @@
 
 {$include fpmake_proc.inc}
 
-procedure add_packages(const ADirectory: string);
-
+procedure add_packages_comandlineoptions();
 begin
   AddCustomFpmakeCommandlineOption('data2inc', 'Use indicated data2inc executable.');
   AddCustomFpmakeCommandlineOption('genfpmkunit', 'Regenerate the fpmkunitsrc.inc file (fppkg).');
+  add_ide_comandlineoptions();
+end;
+
+procedure add_packages(const ADirectory: string);
+
+begin
 
 {$include fpmake_add.inc}
 
@@ -47,6 +52,7 @@ procedure add_packages(const ADirectory: string);
 
 {$ifdef no_parent}
 begin
+  add_packages_comandlineoptions();
   add_packages('');
   Installer.Run;
 end.
diff --git a/packages/ide/fpmake.pp b/packages/ide/fpmake.pp
index c5b3fdfe69f..1ed961817a3 100644
--- a/packages/ide/fpmake.pp
+++ b/packages/ide/fpmake.pp
@@ -140,6 +140,15 @@ procedure ide_check_gdb_availability(Sender: TObject);
     end;
 end;
 
+procedure add_ide_comandlineoptions();
+begin
+  AddCustomFpmakeCommandlineOption('CompilerTarget','Target CPU for the IDE''s compiler');
+  AddCustomFpmakeCommandlineOption('NoGDB','If value=1 or ''Y'', no GDB support');
+  AddCustomFpmakeCommandlineOption('NoGDBMI','If value=1 or ''Y'', explicitly disable GDB/MI option');
+  AddCustomFpmakeCommandlineOption('GDBMI','If value=1 or ''Y'', builds IDE with GDB/MI support (no need for LibGDB)');
+  AddCustomFpmakeCommandlineOption('NoIDE','If value=1 or ''Y'', the IDE will be skipped');
+end;
+
 procedure add_ide(const ADirectory: string);
 
 Var
@@ -150,12 +159,12 @@ procedure add_ide(const ADirectory: string);
   s: string;
 
 begin
-  AddCustomFpmakeCommandlineOption('CompilerTarget','Target CPU for the IDE''s compiler');
-  AddCustomFpmakeCommandlineOption('NoGDB','If value=1 or ''Y'', no GDB support');
-  AddCustomFpmakeCommandlineOption('NOGDBMI','If value=1 or ''Y'', explicitly disable GDB/MI option');
-  AddCustomFpmakeCommandlineOption('GDBMI','If value=1 or ''Y'', builds IDE with GDB/MI support (no need for LibGDB)');
   With Installer do
     begin
+    s := GetCustomFpmakeCommandlineOptionValue('NoIDE');
+    if (s='1') or (s='Y') then
+      Exit;
+
     s := GetCustomFpmakeCommandlineOptionValue('NoGDB');
     if (s='1') or (s='Y') then
      NoGDBOption := true;
@@ -319,6 +328,7 @@ procedure add_ide(const ADirectory: string);
 
 {$ifndef ALLPACKAGES}
 begin
+  add_ide_comandlineoptions();
   add_ide('');
   Installer.Run;
 end.