diff --git a/packager/pkgoptionsdlg.lfm b/packager/pkgoptionsdlg.lfm
index 21ce257e69..8ee98a0884 100644
--- a/packager/pkgoptionsdlg.lfm
+++ b/packager/pkgoptionsdlg.lfm
@@ -3,7 +3,6 @@ object PackageOptionsDialog: TPackageOptionsDialog
   Height = 450
   Top = 256
   Width = 528
-  ActiveControl = Notebook
   Caption = 'PackageOptionsDialog'
   ClientHeight = 450
   ClientWidth = 528
@@ -34,7 +33,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Add paths to dependent packages/projects'
-        ClientHeight = 114
+        ClientHeight = 115
         ClientWidth = 508
         TabOrder = 0
         object UnitPathLabel: TLabel
@@ -154,7 +153,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'Add options to dependent packages and projects'
-        ClientHeight = 160
+        ClientHeight = 161
         ClientWidth = 508
         TabOrder = 1
         object LinkerOptionsLabel: TLabel
@@ -225,7 +224,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'ProjectGroupBox'
-        ClientHeight = 32
+        ClientHeight = 33
         ClientWidth = 508
         TabOrder = 2
         object AddPackageUnitToProjectCheckBox: TCheckBox
@@ -256,8 +255,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
     end
     object DescriptionPage: TTabSheet
       Caption = 'Description'
-      ClientHeight = 387
-      ClientWidth = 524
+      ClientHeight = 386
+      ClientWidth = 520
       object DescriptionGroupBox: TGroupBox
         AnchorSideLeft.Control = DescriptionPage
         AnchorSideTop.Control = DescriptionPage
@@ -266,12 +265,12 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 96
         Top = 6
-        Width = 512
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         Caption = 'Description/Abstract'
-        ClientHeight = 77
-        ClientWidth = 508
+        ClientHeight = 78
+        ClientWidth = 504
         TabOrder = 0
         object DescriptionMemo: TMemo
           AnchorSideLeft.Control = DescriptionGroupBox
@@ -279,9 +278,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = DescriptionGroupBox
           AnchorSideBottom.Control = DescriptionGroupBox
           Left = 6
-          Height = 65
+          Height = 66
           Top = 6
-          Width = 496
+          Width = 492
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -296,15 +295,15 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 52
+        Height = 51
         Top = 108
-        Width = 512
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Author:'
         ClientHeight = 33
-        ClientWidth = 508
+        ClientWidth = 504
         TabOrder = 1
         object AuthorEdit: TEdit
           AnchorSideBottom.Control = AuthorGroupBox
@@ -312,7 +311,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 6
           Height = 21
           Top = 6
-          Width = 496
+          Width = 492
           Align = alTop
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -327,13 +326,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Control = VersionGroupBox
         Left = 6
         Height = 109
-        Top = 166
-        Width = 512
+        Top = 165
+        Width = 508
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'License:'
-        ClientHeight = 90
-        ClientWidth = 508
+        ClientHeight = 91
+        ClientWidth = 504
         TabOrder = 2
         object LicenseMemo: TMemo
           AnchorSideLeft.Control = LicenseGroupBox
@@ -341,9 +340,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Control = LicenseGroupBox
           AnchorSideBottom.Control = LicenseGroupBox
           Left = 6
-          Height = 78
+          Height = 79
           Top = 6
-          Width = 496
+          Width = 492
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -358,43 +357,43 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Control = DescriptionPage
         Left = 6
         Height = 100
-        Top = 281
-        Width = 512
+        Top = 280
+        Width = 508
         Align = alBottom
         BorderSpacing.Around = 6
         Caption = 'Version'
-        ClientHeight = 81
-        ClientWidth = 508
+        ClientHeight = 82
+        ClientWidth = 504
         TabOrder = 3
         object VersionMajorLabel: TLabel
           Left = 6
-          Height = 16
+          Height = 14
           Top = 3
-          Width = 33
+          Width = 28
           Caption = 'Major'
           ParentColor = False
         end
         object VersionMinorLabel: TLabel
           Left = 110
-          Height = 16
+          Height = 14
           Top = 3
-          Width = 34
+          Width = 27
           Caption = 'Minor'
           ParentColor = False
         end
         object VersionReleaseLabel: TLabel
           Left = 214
-          Height = 16
+          Height = 14
           Top = 3
-          Width = 45
+          Width = 39
           Caption = 'Release'
           ParentColor = False
         end
         object VersionBuildLabel: TLabel
           Left = 318
-          Height = 16
+          Height = 14
           Top = 3
-          Width = 84
+          Width = 63
           Caption = 'Build Number'
           ParentColor = False
         end
@@ -459,8 +458,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 116
-        ClientWidth = 514
+        ClientHeight = 98
+        ClientWidth = 510
         ItemIndex = 2
         Items.Strings = (
           'Designtime only'
@@ -492,8 +491,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 116
-        ClientWidth = 514
+        ClientHeight = 98
+        ClientWidth = 510
         ItemIndex = 0
         Items.Strings = (
           'Automatically rebuild as needed'
@@ -516,8 +515,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'LazDoc - Lazarus documentation'
-        ClientHeight = 58
-        ClientWidth = 514
+        ClientHeight = 40
+        ClientWidth = 510
         TabOrder = 2
         object LazDocPathEdit: TEdit
           AnchorSideLeft.Control = LazDocGroupBox
@@ -549,8 +548,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'This package provides the same as the following packages:'
-        ClientHeight = 363
-        ClientWidth = 514
+        ClientHeight = 345
+        ClientWidth = 510
         TabOrder = 0
         object ProvidesMemo: TMemo
           AnchorSideLeft.Control = ProvidesGroupBox
@@ -586,7 +585,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'i18n Options'
-        ClientHeight = 55
+        ClientHeight = 56
         ClientWidth = 508
         TabOrder = 0
         object PoOutDirLabel: TLabel
@@ -649,6 +648,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
     Width = 516
     OKButton.Name = 'OKButton'
     OKButton.Caption = '&OK'
+    OKButton.OnClick = OkButtonClick
     HelpButton.Name = 'HelpButton'
     HelpButton.Caption = '&Help'
     HelpButton.Enabled = False
diff --git a/packager/pkgoptionsdlg.pas b/packager/pkgoptionsdlg.pas
index 6cc7937f55..89949b2fdf 100644
--- a/packager/pkgoptionsdlg.pas
+++ b/packager/pkgoptionsdlg.pas
@@ -404,7 +404,8 @@ begin
   Notebook.Page[4].Caption:=lisPckOptsProvides;
   Notebook.Page[5].Caption:=dlgPOI18n;
 
-  ButtonPanel1.OKButton.OnClick:=@OkButtonClick;
+  ButtonPanel1.OKButton.Caption:=lisOk;
+  ButtonPanel1.CancelButton.Caption:=dlgCancel;
 
   SetupUsagePage;
   SetupIDEPage;