diff --git a/packager/pkgoptionsdlg.lfm b/packager/pkgoptionsdlg.lfm
index e3a50380db..21ce257e69 100644
--- a/packager/pkgoptionsdlg.lfm
+++ b/packager/pkgoptionsdlg.lfm
@@ -11,40 +11,40 @@ object PackageOptionsDialog: TPackageOptionsDialog
   Constraints.MinWidth = 520
   OnClose = PackageOptionsDialogClose
   OnCreate = FormCreate
-  LCLVersion = '0.9.27'
-  object Notebook: TNotebook
+  LCLVersion = '0.9.29'
+  object Notebook: TPageControl
     Left = 0
-    Height = 402
+    Height = 412
     Top = 0
     Width = 528
+    ActivePage = DescriptionPage
     Align = alClient
-    PageIndex = 2
+    TabIndex = 2
     TabOrder = 0
-    object UsagePage: TPage
+    object UsagePage: TTabSheet
       Caption = 'Usage'
-      ClientWidth = 526
-      ClientHeight = 375
+      ClientHeight = 387
+      ClientWidth = 524
       object AddPathsGroupBox: TGroupBox
-        AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 142
+        Height = 133
         Top = 6
-        Width = 514
+        Width = 512
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Add paths to dependent packages/projects'
-        ClientHeight = 123
-        ClientWidth = 510
+        ClientHeight = 114
+        ClientWidth = 508
         TabOrder = 0
         object UnitPathLabel: TLabel
           AnchorSideLeft.Control = AddPathsGroupBox
           AnchorSideTop.Control = UnitPathEdit
           AnchorSideTop.Side = asrCenter
           Left = 6
-          Height = 18
-          Top = 10
-          Width = 27
+          Height = 16
+          Top = 8
+          Width = 26
           BorderSpacing.Left = 6
           Caption = 'Unit'
           ParentColor = False
@@ -53,8 +53,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideLeft.Control = AddPathsGroupBox
           AnchorSideTop.Control = IncludePathEdit
           Left = 6
-          Height = 18
-          Top = 39
+          Height = 16
+          Top = 33
           Width = 46
           BorderSpacing.Left = 6
           Caption = 'Include'
@@ -65,9 +65,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideTop.Control = ObjectPathEdit
           AnchorSideTop.Side = asrCenter
           Left = 6
-          Height = 18
-          Top = 76
-          Width = 42
+          Height = 16
+          Top = 62
+          Width = 40
           BorderSpacing.Left = 6
           Caption = 'Object'
           ParentColor = False
@@ -77,9 +77,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideTop.Control = LibraryPathEdit
           AnchorSideTop.Side = asrCenter
           Left = 6
-          Height = 18
-          Top = 109
-          Width = 44
+          Height = 16
+          Top = 89
+          Width = 43
           BorderSpacing.Left = 6
           Caption = 'Library'
           ParentColor = False
@@ -90,9 +90,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = AddPathsGroupBox
           AnchorSideRight.Side = asrBottom
           Left = 80
-          Height = 27
+          Height = 21
           Top = 6
-          Width = 380
+          Width = 378
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 6
           BorderSpacing.Right = 50
@@ -105,9 +105,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = AddPathsGroupBox
           AnchorSideRight.Side = asrBottom
           Left = 80
-          Height = 27
-          Top = 39
-          Width = 380
+          Height = 21
+          Top = 33
+          Width = 378
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 6
           BorderSpacing.Right = 50
@@ -120,9 +120,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = AddPathsGroupBox
           AnchorSideRight.Side = asrBottom
           Left = 80
-          Height = 27
-          Top = 72
-          Width = 380
+          Height = 21
+          Top = 60
+          Width = 378
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 6
           BorderSpacing.Right = 50
@@ -135,9 +135,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = AddPathsGroupBox
           AnchorSideRight.Side = asrBottom
           Left = 80
-          Height = 27
-          Top = 105
-          Width = 380
+          Height = 21
+          Top = 87
+          Width = 378
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Left = 80
           BorderSpacing.Top = 6
@@ -147,26 +147,23 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
       end
       object AddOptionsGroupBox: TGroupBox
-        AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Side = asrBottom
-        AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 171
-        Top = 154
-        Width = 514
+        Height = 179
+        Top = 145
+        Width = 512
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'Add options to dependent packages and projects'
-        ClientHeight = 152
-        ClientWidth = 510
+        ClientHeight = 160
+        ClientWidth = 508
         TabOrder = 1
         object LinkerOptionsLabel: TLabel
           AnchorSideLeft.Control = AddOptionsGroupBox
           AnchorSideTop.Control = LinkerOptionsMemo
           Left = 6
-          Height = 18
+          Height = 16
           Top = 6
-          Width = 39
+          Width = 38
           BorderSpacing.Left = 6
           Caption = 'Linker'
           ParentColor = False
@@ -175,9 +172,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideLeft.Control = AddOptionsGroupBox
           AnchorSideTop.Control = CustomOptionsMemo
           Left = 6
-          Height = 18
+          Height = 16
           Top = 74
-          Width = 51
+          Width = 47
           BorderSpacing.Left = 6
           Caption = 'Custom'
           ParentColor = False
@@ -187,10 +184,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideTop.Control = AddOptionsGroupBox
           AnchorSideRight.Control = AddOptionsGroupBox
           AnchorSideRight.Side = asrBottom
-          Left = 67
+          Left = 63
           Height = 62
           Top = 6
-          Width = 437
+          Width = 439
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 6
           BorderSpacing.Right = 6
@@ -206,10 +203,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = AddOptionsGroupBox
           AnchorSideBottom.Side = asrBottom
-          Left = 67
-          Height = 72
+          Left = 63
+          Height = 80
           Top = 74
-          Width = 437
+          Width = 439
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Left = 10
           BorderSpacing.Top = 6
@@ -221,21 +218,21 @@ object PackageOptionsDialog: TPackageOptionsDialog
       end
       object ProjectGroupBox: TGroupBox
         Left = 6
-        Height = 38
-        Top = 331
-        Width = 514
+        Height = 51
+        Top = 330
+        Width = 512
         Align = alBottom
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'ProjectGroupBox'
-        ClientHeight = 19
-        ClientWidth = 510
+        ClientHeight = 32
+        ClientWidth = 508
         TabOrder = 2
         object AddPackageUnitToProjectCheckBox: TCheckBox
           Left = 6
-          Height = 22
+          Height = 20
           Top = 6
-          Width = 498
+          Width = 496
           Align = alTop
           BorderSpacing.Around = 6
           Caption = 'AddPackageUnitToProjectCheckBox'
@@ -243,10 +240,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
       end
     end
-    object Usage2Page: TPage
+    object Usage2Page: TTabSheet
       Caption = 'Usage2'
-      ClientWidth = 526
       ClientHeight = 375
+      ClientWidth = 526
       object ConditionalsGroupBox: TGroupBox
         Left = 0
         Height = 199
@@ -257,10 +254,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
         TabOrder = 0
       end
     end
-    object DescriptionPage: TPage
+    object DescriptionPage: TTabSheet
       Caption = 'Description'
-      ClientWidth = 526
-      ClientHeight = 375
+      ClientHeight = 387
+      ClientWidth = 524
       object DescriptionGroupBox: TGroupBox
         AnchorSideLeft.Control = DescriptionPage
         AnchorSideTop.Control = DescriptionPage
@@ -269,24 +266,22 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 96
         Top = 6
-        Width = 514
+        Width = 512
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         Caption = 'Description/Abstract'
-        ClientHeight = 92
-        ClientWidth = 510
+        ClientHeight = 77
+        ClientWidth = 508
         TabOrder = 0
         object DescriptionMemo: TMemo
           AnchorSideLeft.Control = DescriptionGroupBox
           AnchorSideTop.Control = DescriptionGroupBox
           AnchorSideRight.Control = DescriptionGroupBox
-          AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = DescriptionGroupBox
-          AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 80
+          Height = 65
           Top = 6
-          Width = 498
+          Width = 496
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -301,24 +296,23 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 58
+        Height = 52
         Top = 108
-        Width = 514
+        Width = 512
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Author:'
-        ClientHeight = 39
-        ClientWidth = 510
+        ClientHeight = 33
+        ClientWidth = 508
         TabOrder = 1
         object AuthorEdit: TEdit
-          AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = AuthorGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 27
+          Height = 21
           Top = 6
-          Width = 498
+          Width = 496
           Align = alTop
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -332,26 +326,24 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = VersionGroupBox
         Left = 6
-        Height = 91
-        Top = 172
-        Width = 514
+        Height = 109
+        Top = 166
+        Width = 512
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'License:'
-        ClientHeight = 72
-        ClientWidth = 510
+        ClientHeight = 90
+        ClientWidth = 508
         TabOrder = 2
         object LicenseMemo: TMemo
           AnchorSideLeft.Control = LicenseGroupBox
           AnchorSideTop.Control = LicenseGroupBox
           AnchorSideRight.Control = LicenseGroupBox
-          AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = LicenseGroupBox
-          AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 60
+          Height = 78
           Top = 6
-          Width = 498
+          Width = 496
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -363,55 +355,53 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideTop.Control = LicenseGroupBox
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = DescriptionPage
-        AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = DescriptionPage
-        AnchorSideBottom.Side = asrBottom
         Left = 6
         Height = 100
-        Top = 269
-        Width = 514
+        Top = 281
+        Width = 512
         Align = alBottom
         BorderSpacing.Around = 6
         Caption = 'Version'
         ClientHeight = 81
-        ClientWidth = 510
+        ClientWidth = 508
         TabOrder = 3
         object VersionMajorLabel: TLabel
           Left = 6
-          Height = 18
+          Height = 16
           Top = 3
-          Width = 36
+          Width = 33
           Caption = 'Major'
           ParentColor = False
         end
         object VersionMinorLabel: TLabel
           Left = 110
-          Height = 18
+          Height = 16
           Top = 3
-          Width = 36
+          Width = 34
           Caption = 'Minor'
           ParentColor = False
         end
         object VersionReleaseLabel: TLabel
           Left = 214
-          Height = 18
+          Height = 16
           Top = 3
-          Width = 50
+          Width = 45
           Caption = 'Release'
           ParentColor = False
         end
         object VersionBuildLabel: TLabel
           Left = 318
-          Height = 18
+          Height = 16
           Top = 3
-          Width = 88
+          Width = 84
           Caption = 'Build Number'
           ParentColor = False
         end
         object VersionMajorSpinEdit: TSpinEdit
           AnchorSideLeft.Control = VersionGroupBox
           Left = 6
-          Height = 27
+          Height = 21
           Top = 20
           Width = 68
           BorderSpacing.Left = 6
@@ -420,7 +410,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
         object VersionMinorSpinEdit: TSpinEdit
           Left = 110
-          Height = 27
+          Height = 21
           Top = 20
           Width = 68
           MaxValue = 9999
@@ -428,7 +418,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
         object VersionReleaseSpinEdit: TSpinEdit
           Left = 214
-          Height = 27
+          Height = 21
           Top = 20
           Width = 68
           MaxValue = 9999
@@ -436,7 +426,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
         object VersionBuildSpinEdit: TSpinEdit
           Left = 318
-          Height = 27
+          Height = 21
           Top = 20
           Width = 68
           MaxValue = 9999
@@ -444,10 +434,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
       end
     end
-    object IDEPage: TPage
+    object IDEPage: TTabSheet
       Caption = 'IDE Integration'
-      ClientWidth = 526
       ClientHeight = 375
+      ClientWidth = 526
       object PkgTypeRadioGroup: TRadioGroup
         AnchorSideLeft.Control = IDEPage
         AnchorSideTop.Control = IDEPage
@@ -469,8 +459,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 112
-        ClientWidth = 510
+        ClientHeight = 116
+        ClientWidth = 514
         ItemIndex = 2
         Items.Strings = (
           'Designtime only'
@@ -502,8 +492,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 112
-        ClientWidth = 510
+        ClientHeight = 116
+        ClientWidth = 514
         ItemIndex = 0
         Items.Strings = (
           'Automatically rebuild as needed'
@@ -526,8 +516,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'LazDoc - Lazarus documentation'
-        ClientHeight = 54
-        ClientWidth = 510
+        ClientHeight = 58
+        ClientWidth = 514
         TabOrder = 2
         object LazDocPathEdit: TEdit
           AnchorSideLeft.Control = LazDocGroupBox
@@ -542,17 +532,15 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
       end
     end
-    object ProvidesPage: TPage
+    object ProvidesPage: TTabSheet
       Caption = 'Provides'
-      ClientWidth = 526
       ClientHeight = 375
+      ClientWidth = 526
       object ProvidesGroupBox: TGroupBox
         AnchorSideLeft.Control = ProvidesPage
         AnchorSideTop.Control = ProvidesPage
         AnchorSideRight.Control = ProvidesPage
-        AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = ProvidesPage
-        AnchorSideBottom.Side = asrBottom
         Left = 6
         Height = 363
         Top = 6
@@ -561,15 +549,14 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'This package provides the same as the following packages:'
-        ClientHeight = 359
-        ClientWidth = 510
+        ClientHeight = 363
+        ClientWidth = 514
         TabOrder = 0
         object ProvidesMemo: TMemo
           AnchorSideLeft.Control = ProvidesGroupBox
           AnchorSideTop.Control = ProvidesGroupBox
           AnchorSideRight.Control = ProvidesGroupBox
           AnchorSideBottom.Control = ProvidesGroupBox
-          AnchorSideBottom.Side = asrBottom
           Left = 6
           Height = 347
           Top = 6
@@ -581,10 +568,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
         end
       end
     end
-    object i18n: TPage
+    object i18n: TTabSheet
       Caption = 'i18n'
-      ClientWidth = 526
-      ClientHeight = 375
+      ClientHeight = 387
+      ClientWidth = 524
       object I18NGroupBox: TGroupBox
         AnchorSideLeft.Control = i18n
         AnchorSideTop.Control = EnableI18NCheckBox
@@ -592,23 +579,23 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Control = i18n
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 84
-        Top = 35
-        Width = 514
+        Height = 74
+        Top = 33
+        Width = 512
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'i18n Options'
-        ClientHeight = 80
-        ClientWidth = 510
+        ClientHeight = 55
+        ClientWidth = 508
         TabOrder = 0
         object PoOutDirLabel: TLabel
           AnchorSideLeft.Control = I18NGroupBox
           AnchorSideTop.Control = I18NGroupBox
           Left = 6
-          Height = 18
+          Height = 16
           Top = 6
-          Width = 132
+          Width = 126
           BorderSpacing.Around = 6
           Caption = 'PO Output Directory:'
           ParentColor = False
@@ -619,9 +606,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = POOutDirButton
           Left = 6
-          Height = 27
-          Top = 30
-          Width = 468
+          Height = 21
+          Top = 28
+          Width = 415
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -632,10 +619,10 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = POOutDirEdit
           AnchorSideBottom.Side = asrBottom
-          Left = 480
-          Height = 27
-          Top = 30
-          Width = 24
+          Left = 427
+          Height = 21
+          Top = 28
+          Width = 75
           Anchors = [akTop, akRight, akBottom]
           AutoSize = True
           BorderSpacing.Right = 6
@@ -646,9 +633,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
       end
       object EnableI18NCheckBox: TCheckBox
         Left = 6
-        Height = 22
+        Height = 20
         Top = 7
-        Width = 98
+        Width = 96
         Caption = 'Enable i18n'
         OnChange = EnableI18NCheckBoxChange
         TabOrder = 1
@@ -657,9 +644,19 @@ object PackageOptionsDialog: TPackageOptionsDialog
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 36
-    Top = 408
+    Height = 26
+    Top = 418
     Width = 516
+    OKButton.Name = 'OKButton'
+    OKButton.Caption = '&OK'
+    HelpButton.Name = 'HelpButton'
+    HelpButton.Caption = '&Help'
+    HelpButton.Enabled = False
+    CloseButton.Name = 'CloseButton'
+    CloseButton.Caption = '&Close'
+    CloseButton.Enabled = False
+    CancelButton.Name = 'CancelButton'
+    CancelButton.Caption = 'Cancel'
     TabOrder = 1
     ShowButtons = [pbOK, pbCancel]
     ShowBevel = False
diff --git a/packager/pkgoptionsdlg.pas b/packager/pkgoptionsdlg.pas
index 83cb71001e..6cc7937f55 100644
--- a/packager/pkgoptionsdlg.pas
+++ b/packager/pkgoptionsdlg.pas
@@ -39,8 +39,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LCLProc, Forms, Controls, Buttons, 
-  ExtCtrls, StdCtrls, Spin, Dialogs, PathEditorDlg, IDEProcs, IDEWindowIntf,
-  IDEDialogs, MacroIntf, PackageIntf,
+  ExtCtrls, ComCtrls, StdCtrls, Spin, Dialogs, PathEditorDlg,
+  IDEProcs, IDEWindowIntf, IDEDialogs, MacroIntf, PackageIntf,
   LazarusIDEStrConsts,
   BrokenDependenciesDlg, PackageDefs, PackageSystem, CompilerOptions,
   ButtonPanel;
@@ -55,13 +55,13 @@ type
     ButtonPanel1: TButtonPanel;
     EnableI18NCheckBox: TCheckBox;
     ConditionalsGroupBox: TGroupBox;
-    Usage2Page: TPage;
+    Usage2Page: TTabSheet;
     ProjectGroupBox: TGroupBox;
     I18NGroupBox: TGroupBox;
     ProvidesGroupBox: TGroupBox;
     LazDocGroupBox: TGroupBox;
     ProvidesMemo: TMemo;
-    i18n: TPage;
+    i18n: TTabSheet;
     POOutDirButton: TButton;
     POOutDirEdit: TEdit;
     PkgTypeRadioGroup: TRadioGroup;
@@ -93,16 +93,16 @@ type
     AddOptionsGroupBox: TGroupBox;
     AuthorEdit: TEdit;
     UnitPathLabel: TLabel;
-    Notebook: TNotebook;
+    Notebook: TPageControl;
     UnitPathEdit: TEdit;
     PoOutDirLabel: TLabel;
     IncludePathLabel: TLabel;
     ObjectPathLabel: TLabel;
     LibraryPathLabel: TLabel;
-    UsagePage: TPage;
-    DescriptionPage: TPage;
-    IDEPage: TPage;
-    ProvidesPage: TPage;
+    UsagePage: TTabSheet;
+    DescriptionPage: TTabSheet;
+    IDEPage: TTabSheet;
+    ProvidesPage: TTabSheet;
     VersionBuildLabel: TLabel;
     VersionMinorSpinEdit: TSpinEdit;
     VersionBuildSpinEdit: TSpinEdit;