diff --git a/packager/pkgoptionsdlg.lfm b/packager/pkgoptionsdlg.lfm
index 5aed01e3cb..43f1cab272 100644
--- a/packager/pkgoptionsdlg.lfm
+++ b/packager/pkgoptionsdlg.lfm
@@ -12,7 +12,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
   LCLVersion = '0.9.27'
   object Notebook: TNotebook
     Left = 0
-    Height = 393
+    Height = 401
     Top = 0
     Width = 528
     Align = alClient
@@ -21,7 +21,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object UsagePage: TPage
       Caption = 'Usage'
       ClientWidth = 520
-      ClientHeight = 366
+      ClientHeight = 367
       object AddPathsGroupBox: TGroupBox
         AnchorSideRight.Side = asrBottom
         Left = 6
@@ -121,13 +121,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 173
+        Height = 174
         Top = 140
         Width = 508
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'Add options to dependent packages and projects'
-        ClientHeight = 155
+        ClientHeight = 156
         ClientWidth = 504
         TabOrder = 1
         object LinkerOptionsLabel: TLabel
@@ -173,7 +173,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = AddOptionsGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 67
-          Height = 75
+          Height = 76
           Top = 74
           Width = 431
           Anchors = [akTop, akLeft, akRight, akBottom]
@@ -188,7 +188,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
       object ProjectGroupBox: TGroupBox
         Left = 6
         Height = 41
-        Top = 319
+        Top = 320
         Width = 508
         Align = alBottom
         AutoSize = True
@@ -213,7 +213,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object Usage2Page: TPage
       Caption = 'Usage2'
       ClientWidth = 520
-      ClientHeight = 367
+      ClientHeight = 375
       object ConditionalsGroupBox: TGroupBox
         Left = 0
         Height = 199
@@ -227,7 +227,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object DescriptionPage: TPage
       Caption = 'Description'
       ClientWidth = 520
-      ClientHeight = 366
+      ClientHeight = 367
       object DescriptionGroupBox: TGroupBox
         AnchorSideLeft.Control = DescriptionPage
         AnchorSideTop.Control = DescriptionPage
@@ -299,13 +299,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = VersionGroupBox
         Left = 6
-        Height = 101
+        Height = 102
         Top = 153
         Width = 508
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'License:'
-        ClientHeight = 83
+        ClientHeight = 84
         ClientWidth = 504
         TabOrder = 2
         object LicenseMemo: TMemo
@@ -316,7 +316,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = LicenseGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 71
+          Height = 72
           Top = 6
           Width = 492
           Align = alClient
@@ -335,7 +335,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Side = asrBottom
         Left = 6
         Height = 100
-        Top = 260
+        Top = 261
         Width = 508
         Align = alBottom
         BorderSpacing.Around = 6
@@ -427,7 +427,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object IDEPage: TPage
       Caption = 'IDE Integration'
       ClientWidth = 520
-      ClientHeight = 366
+      ClientHeight = 367
       object PkgTypeRadioGroup: TRadioGroup
         AnchorSideLeft.Control = IDEPage
         AnchorSideTop.Control = IDEPage
@@ -525,7 +525,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object ProvidesPage: TPage
       Caption = 'Provides'
       ClientWidth = 520
-      ClientHeight = 366
+      ClientHeight = 367
       object ProvidesGroupBox: TGroupBox
         AnchorSideLeft.Control = ProvidesPage
         AnchorSideTop.Control = ProvidesPage
@@ -534,14 +534,14 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Control = ProvidesPage
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 354
+        Height = 355
         Top = 6
         Width = 508
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'This package provides the same as the following packages:'
-        ClientHeight = 336
+        ClientHeight = 337
         ClientWidth = 504
         TabOrder = 0
         object ProvidesMemo: TMemo
@@ -551,7 +551,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = ProvidesGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 324
+          Height = 325
           Top = 6
           Width = 492
           Align = alClient
@@ -564,7 +564,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     object i18n: TPage
       Caption = 'i18n'
       ClientWidth = 520
-      ClientHeight = 366
+      ClientHeight = 367
       object I18NGroupBox: TGroupBox
         AnchorSideLeft.Control = i18n
         AnchorSideTop.Control = EnableI18NCheckBox
@@ -637,10 +637,11 @@ object PackageOptionsDialog: TPackageOptionsDialog
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 34
-    Top = 399
+    Height = 26
+    Top = 407
     Width = 516
     TabOrder = 1
     ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
   end
 end
diff --git a/packager/pkgoptionsdlg.lrs b/packager/pkgoptionsdlg.lrs
index 914ef3be9d..c23c503c94 100644
--- a/packager/pkgoptionsdlg.lrs
+++ b/packager/pkgoptionsdlg.lrs
@@ -6,9 +6,9 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'Caption'#6#20'PackageOptionsDialog'#12'ClientHeight'#3#183#1#11'ClientWidth'
   +#3#16#2#7'OnClose'#7#25'PackageOptionsDialogClose'#8'OnCreate'#7#10'FormCrea'
   +'te'#10'LCLVersion'#6#6'0.9.27'#0#9'TNotebook'#8'Notebook'#4'Left'#2#0#6'Hei'
-  +'ght'#3#137#1#3'Top'#2#0#5'Width'#3#16#2#5'Align'#7#8'alClient'#9'PageIndex'
+  +'ght'#3#145#1#3'Top'#2#0#5'Width'#3#16#2#5'Align'#7#8'alClient'#9'PageIndex'
   +#2#1#8'TabOrder'#2#0#0#5'TPage'#9'UsagePage'#7'Caption'#6#5'Usage'#11'Client'
-  +'Width'#3#8#2#12'ClientHeight'#3'n'#1#0#9'TGroupBox'#16'AddPathsGroupBox'#20
+  +'Width'#3#8#2#12'ClientHeight'#3'o'#1#0#9'TGroupBox'#16'AddPathsGroupBox'#20
   +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2
   +#6#5'Width'#3#252#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Capti'
   +'on'#6'(Add paths to dependent packages/projects'#12'ClientHeight'#2'n'#11'C'
@@ -38,10 +38,10 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#19'BorderSpacin'
   +'g.Right'#2'2'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#18'AddOptionsGroupBox'#18
   +'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#173#0#3'To'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#174#0#3'To'
   +'p'#3#140#0#5'Width'#3#252#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6'.Add options to dependent packages and projects'#12'Client'
-  +'Height'#3#155#0#11'ClientWidth'#3#248#1#8'TabOrder'#2#1#0#6'TLabel'#18'Link'
+  +'Height'#3#156#0#11'ClientWidth'#3#248#1#8'TabOrder'#2#1#0#6'TLabel'#18'Link'
   +'erOptionsLabel'#21'AnchorSideTop.Control'#7#17'LinkerOptionsMemo'#4'Left'#2
   +#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2''''#7'Caption'#6#6'Linker'#11'Parent'
   +'Color'#8#0#0#6'TLabel'#18'CustomOptionsLabel'#21'AnchorSideTop.Control'#7#17
@@ -57,22 +57,22 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'AnchorSideTop.Control'#7#17'LinkerOptionsMemo'#18'AnchorSideTop.Side'#7#9'a'
   +'srBottom'#23'AnchorSideRight.Control'#7#18'AddOptionsGroupBox'#20'AnchorSid'
   +'eRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'AddOptionsGro'
-  +'upBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'C'#6'Height'#2'K'
+  +'upBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'C'#6'Height'#2'L'
   +#3'Top'#2'J'#5'Width'#3#175#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
   +'akBottom'#0#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#19'Border'
   +'Spacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'ScrollBars'#7#14'ssAutoV'
   +'ertical'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#15'ProjectGroupBox'#4'Left'#2#6
-  +#6'Height'#2')'#3'Top'#3'?'#1#5'Width'#3#252#1#5'Align'#7#8'alBottom'#8'Auto'
+  +#6'Height'#2')'#3'Top'#3'@'#1#5'Width'#3#252#1#5'Align'#7#8'alBottom'#8'Auto'
   +'Size'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'ProjectGroupBox'#12'Cl'
   +'ientHeight'#2#23#11'ClientWidth'#3#248#1#8'TabOrder'#2#2#0#9'TCheckBox'#31
   ,'AddPackageUnitToProjectCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#0#5'Wi'
   +'dth'#3#236#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacin'
   +'g.Right'#2#6#7'Caption'#6#31'AddPackageUnitToProjectCheckBox'#8'TabOrder'#2
   +#0#0#0#0#0#5'TPage'#10'Usage2Page'#7'Caption'#6#6'Usage2'#11'ClientWidth'#3#8
-  +#2#12'ClientHeight'#3'o'#1#0#9'TGroupBox'#20'ConditionalsGroupBox'#4'Left'#2
+  +#2#12'ClientHeight'#3'w'#1#0#9'TGroupBox'#20'ConditionalsGroupBox'#4'Left'#2
   +#0#6'Height'#3#199#0#3'Top'#2#0#5'Width'#3#8#2#5'Align'#7#5'alTop'#7'Caption'
   +#6#20'ConditionalsGroupBox'#8'TabOrder'#2#0#0#0#0#5'TPage'#15'DescriptionPag'
-  +'e'#7'Caption'#6#11'Description'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'
+  +'e'#7'Caption'#6#11'Description'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'o'
   +#1#0#9'TGroupBox'#19'DescriptionGroupBox'#22'AnchorSideLeft.Control'#7#15'De'
   +'scriptionPage'#21'AnchorSideTop.Control'#7#15'DescriptionPage'#23'AnchorSid'
   +'eRight.Control'#7#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBotto'
@@ -100,21 +100,21 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'t.Control'#7#15'DescriptionPage'#21'AnchorSideTop.Control'#7#14'AuthorGroup'
   +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#15
   +'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBotto'
-  +'m.Control'#7#15'VersionGroupBox'#4'Left'#2#6#6'Height'#2'e'#3'Top'#3#153#0#5
+  +'m.Control'#7#15'VersionGroupBox'#4'Left'#2#6#6'Height'#2'f'#3'Top'#3#153#0#5
   +'Width'#3#252#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#8'License:'#12'ClientHeight'#2'S'#11
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#8'License:'#12'ClientHeight'#2'T'#11
   +'ClientWidth'#3#248#1#8'TabOrder'#2#2#0#5'TMemo'#11'LicenseMemo'#22'AnchorSi'
   +'deLeft.Control'#7#15'LicenseGroupBox'#21'AnchorSideTop.Control'#7#15'Licens'
   +'eGroupBox'#23'AnchorSideRight.Control'#7#15'LicenseGroupBox'#20'AnchorSideR'
   +'ight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'LicenseGroupBox'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'G'#3'Top'#2
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'H'#3'Top'#2
   +#6#5'Width'#3#236#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'S'
   +'crollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#15'VersionGr'
   +'oupBox'#22'AnchorSideLeft.Control'#7#15'DescriptionPage'#21'AnchorSideTop.C'
   +'ontrol'#7#15'LicenseGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
   +'orSideRight.Control'#7#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asr'
   +'Bottom'#24'AnchorSideBottom.Control'#7#15'DescriptionPage'#21'AnchorSideBot'
-  +'tom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#3#4#1#5'Width'#3
+  +'tom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#3#5#1#5'Width'#3
   +#252#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Ve'
   +'rsion'#12'ClientHeight'#2'R'#11'ClientWidth'#3#248#1#8'TabOrder'#2#3#0#6'TL'
   +'abel'#17'VersionMajorLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#3#5'Width'#2
@@ -138,7 +138,7 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +#22#3'Top'#2'1'#5'Width'#3#28#1#17'BorderSpacing.Top'#2#6#7'Caption'#6'(Auto'
   +'matically increment version on build'#7'Enabled'#8#8'TabOrder'#2#4#0#0#0#0#5
   +'TPage'#7'IDEPage'#7'Caption'#6#15'IDE Integration'#11'ClientWidth'#3#8#2#12
-  +'ClientHeight'#3'n'#1#0#11'TRadioGroup'#17'PkgTypeRadioGroup'#22'AnchorSideL'
+  +'ClientHeight'#3'o'#1#0#11'TRadioGroup'#17'PkgTypeRadioGroup'#22'AnchorSideL'
   +'eft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#7'IDEPage'#23'AnchorS'
   +'ideRight.Control'#7#7'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
   +'ft'#2#6#6'Height'#2't'#3'Top'#2#6#5'Width'#3#252#1#7'Anchors'#11#5'akTop'#6
@@ -176,22 +176,22 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'x'#21'AnchorSideTop.Control'#7#14'LazDocGroupBox'#4'Left'#2#6#6'Height'#2#23
   +#3'Top'#2#6#5'Width'#3#156#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
   +'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#0#5'TPage'#12'ProvidesPage'
-  +#7'Caption'#6#8'Provides'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'#1#0#9
+  +#7'Caption'#6#8'Provides'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'o'#1#0#9
   +'TGroupBox'#16'ProvidesGroupBox'#22'AnchorSideLeft.Control'#7#12'ProvidesPag'
   +'e'#21'AnchorSideTop.Control'#7#12'ProvidesPage'#23'AnchorSideRight.Control'
   +#7#12'ProvidesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBot'
   +'tom.Control'#7#12'ProvidesPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#3'b'#1#3'Top'#2#6#5'Width'#3#252#1#5'Align'#7#8'alBotto'
+  +'Left'#2#6#6'Height'#3'c'#1#3'Top'#2#6#5'Width'#3#252#1#5'Align'#7#8'alBotto'
   +'m'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpaci'
   +'ng.Around'#2#6#7'Caption'#6'9This package provides the same as the followin'
-  +'g packages:'#12'ClientHeight'#3'P'#1#11'ClientWidth'#3#248#1#8'TabOrder'#2#0
+  +'g packages:'#12'ClientHeight'#3'Q'#1#11'ClientWidth'#3#248#1#8'TabOrder'#2#0
   +#0#5'TMemo'#12'ProvidesMemo'#22'AnchorSideLeft.Control'#7#16'ProvidesGroupBo'
   +'x'#21'AnchorSideTop.Control'#7#16'ProvidesGroupBox'#23'AnchorSideRight.Cont'
   +'rol'#7#16'ProvidesGroupBox'#24'AnchorSideBottom.Control'#7#16'ProvidesGroup'
-  +'Box'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'D'#1#3
+  +'Box'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'E'#1#3
   +'Top'#2#6#5'Width'#3#236#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
   +#6#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#0#0#0#0#0#5'TPage'#4'i1'
-  +'8n'#7'Caption'#6#4'i18n'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'#1#0#9
+  +'8n'#7'Caption'#6#4'i18n'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'o'#1#0#9
   +'TGroupBox'#12'I18NGroupBox'#22'AnchorSideLeft.Control'#7#4'i18n'#21'AnchorS'
   ,'ideTop.Control'#7#18'EnableI18NCheckBox'#18'AnchorSideTop.Side'#7#9'asrBott'
   +'om'#23'AnchorSideRight.Control'#7#4'i18n'#20'AnchorSideRight.Side'#7#9'asrB'
@@ -216,6 +216,6 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'ox'#18'EnableI18NCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#7#5'Width'#2
   +'b'#7'Caption'#6#11'Enable i18n'#8'OnChange'#7#24'EnableI18NCheckBoxChange'#8
   +'TabOrder'#2#1#0#0#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Heigh'
-  +'t'#2'"'#3'Top'#3#143#1#5'Width'#3#4#2#8'TabOrder'#2#1#11'ShowButtons'#11#4
-  +'pbOK'#8'pbCancel'#0#0#0#0
+  +'t'#2#26#3'Top'#3#151#1#5'Width'#3#4#2#8'TabOrder'#2#1#11'ShowButtons'#11#4
+  +'pbOK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
 ]);