diff --git a/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.lfm b/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.lfm
index 4db2480dc5..68c701f0f3 100644
--- a/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.lfm
+++ b/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.lfm
@@ -374,7 +374,7 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
       TabOrder = 0
     end
     object bOptions: TButton
-      Left = 506
+      Left = 507
       Height = 26
       Top = 5
       Width = 75
@@ -383,6 +383,16 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
       OnClick = bOptionsClick
       TabOrder = 1
     end
+    object bHelp: TButton
+      Left = 430
+      Height = 26
+      Top = 5
+      Width = 75
+      Anchors = [akTop, akRight]
+      Caption = 'Help'
+      OnClick = bHelpClick
+      TabOrder = 4
+    end
   end
   object imTree: TImageList
     left = 48
diff --git a/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.pas b/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.pas
index c1edf077a4..423be13ff6 100644
--- a/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.pas
+++ b/components/onlinepackagemanager/frames/opkman_createrepositorypackagefr.pas
@@ -40,6 +40,7 @@ type
     bCancel: TButton;
     bCreate: TButton;
     Bevel1: TBevel;
+    bHelp: TButton;
     bOptions: TButton;
     cbOpen: TCheckBox;
     edCategories: TEdit;
@@ -78,6 +79,7 @@ type
     spMain: TSplitter;
     procedure bCancelClick(Sender: TObject);
     procedure bCreateClick(Sender: TObject);
+    procedure bHelpClick(Sender: TObject);
     procedure bOptionsClick(Sender: TObject);
     procedure edPackageDirAcceptDirectory(Sender: TObject; var Value: String);
     procedure edPackageDirButtonClick(Sender: TObject);
@@ -140,6 +142,10 @@ begin
   lbHomePageURL.Caption := rsCreateRepositoryPackageFrm_lbHomePageURL_Caption;
   lbDownloadURL.Caption := rsCreateRepositoryPackageFrm_lbDownloadURL_Caption;
   lbSVNURL.Caption := rsCreateRepositoryPackageFrm_lbSVNURL_Caption;
+  bHelp.Caption := rsCreateRepositoryPackageFrm_bHelp_Caption;
+  bOptions.Caption := rsCreateRepositoryPackageFrm_bOptions_Caption;
+  bCreate.Caption := rsCreateRepositoryPackageFrm_bCreate_Caption;
+  bCancel.Caption := rsCreateRepositoryPackageFrm_bCancel_Caption;
 
   FVSTPackages := TVirtualStringTree.Create(nil);
   with FVSTPackages do
@@ -524,6 +530,11 @@ begin
   end;
 end;
 
+procedure TCreateRepositoryPackagefr.bHelpClick(Sender: TObject);
+begin
+  OpenURL(cHelpPage_CreateRepositoryPackage);
+end;
+
 procedure TCreateRepositoryPackagefr.bOptionsClick(Sender: TObject);
 begin
   MainFrm.ShowOptions(3);
diff --git a/components/onlinepackagemanager/opkman_const.pas b/components/onlinepackagemanager/opkman_const.pas
index 2f254e5b8f..2f8f745004 100644
--- a/components/onlinepackagemanager/opkman_const.pas
+++ b/components/onlinepackagemanager/opkman_const.pas
@@ -41,9 +41,11 @@ const
   cLocalRepositoryConfig = 'config';
   cLocalRepositoryConfigFile = 'options.xml';
   cLocalRepositoryUpdatesFile = 'updates.xml';
-  cExcludedFilesDef = '*.,*.a,*.o,*.ppu,*.compiled,*.bak,*.or,*.rsj,*.~';
-  cExcludedFoldersDef = 'lib,backup';
+  cExcludedFilesDef = '*.,*.a,*.o,*.ppu,*.compiled,*.bak,*.or,*.rsj,*.~,*.exe,*.dbg,*.zip,*.json';
+  cExcludedFoldersDef = 'lib,backup,updates,compiled,.git,.svn';
   cHelpPage = 'http://wiki.freepascal.org/Online_Package_Manager';
+  cHelpPage_CreateRepositoryPackage = 'http://wiki.freepascal.org/Online_Package_Manager#Create_repository_package';
+  cHelpPage_CreateExternalJSON = 'http://wiki.freepascal.org/Online_Package_Manager#Create_JSON_for_updates';
   {$ifdef win64}
   cOpenSSLURL = 'http://packages.lazarus-ide.org/openssl-1.0.2j-x64_86-win64.zip';
   {$endif}
@@ -314,9 +316,14 @@ resourcestring
   rsCreateRepositoryPackageFrm_Message4 = 'Compressing package. Please wait...';
   rsCreateRepositoryPackageFrm_Message5 = 'Creating JSON. Please wait...';
   rsCreateRepositoryPackageFrm_Message6 = 'Repository package successfully created.';
+  rsCreateRepositoryPackageFrm_bHelp_Caption = 'Help';
+  rsCreateRepositoryPackageFrm_bOptions_Caption = 'Options';
+  rsCreateRepositoryPackageFrm_bCreate_Caption = 'Create';
+  rsCreateRepositoryPackageFrm_bCancel_Caption = 'Cancel';
 
   //createupdatejson
   rsCreateJSONForUpdatesFrm_Caption = 'Create update JSON for package:';
+  rsCreateJSONForUpdatesFrm_bHelp_Caption = 'Help';
   rsCreateJSONForUpdatesFrm_bCreate_Caption = 'Create';
   rsCreateJSONForUpdatesFrm_bClose_Caption = 'Cancel';
   rsCreateJSONForUpdatesFrm_cbOpen_Caption = 'After create open containing folder';
diff --git a/components/onlinepackagemanager/opkman_contributors.txt b/components/onlinepackagemanager/opkman_contributors.txt
index fbf4110fbe..505b107fb3 100644
--- a/components/onlinepackagemanager/opkman_contributors.txt
+++ b/components/onlinepackagemanager/opkman_contributors.txt
@@ -2,6 +2,7 @@
 
 Juha Manninen 
 lainz
+Maxim Ganetsky
 minesadorada
 varianus
 Werner Pamler
diff --git a/components/onlinepackagemanager/opkman_createjsonforupdates.lfm b/components/onlinepackagemanager/opkman_createjsonforupdates.lfm
index 6fe99e922b..abfa5f42bb 100644
--- a/components/onlinepackagemanager/opkman_createjsonforupdates.lfm
+++ b/components/onlinepackagemanager/opkman_createjsonforupdates.lfm
@@ -1,12 +1,12 @@
 object CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm
-  Left = 659
-  Height = 272
-  Top = 255
-  Width = 453
+  Left = 524
+  Height = 304
+  Top = 275
+  Width = 580
   BorderIcons = [biSystemMenu]
   Caption = 'CreateJSONForUpdatesFrm'
-  ClientHeight = 272
-  ClientWidth = 453
+  ClientHeight = 304
+  ClientWidth = 580
   Color = clBtnFace
   Constraints.MinHeight = 200
   Constraints.MinWidth = 300
@@ -18,15 +18,15 @@ object CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm
   object pnButtons: TPanel
     Left = 0
     Height = 41
-    Top = 231
-    Width = 453
+    Top = 263
+    Width = 580
     Align = alBottom
     BevelOuter = bvNone
     ClientHeight = 41
-    ClientWidth = 453
+    ClientWidth = 580
     TabOrder = 1
     object bCreate: TButton
-      Left = 287
+      Left = 414
       Height = 26
       Top = 8
       Width = 75
@@ -36,7 +36,7 @@ object CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm
       TabOrder = 0
     end
     object bClose: TButton
-      Left = 364
+      Left = 491
       Height = 26
       Top = 8
       Width = 75
@@ -53,16 +53,26 @@ object CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm
       Caption = 'After create, open containing folder '
       TabOrder = 2
     end
+    object bHelp: TButton
+      Left = 336
+      Height = 26
+      Top = 8
+      Width = 75
+      Anchors = [akTop, akRight]
+      Caption = 'Help'
+      OnClick = bHelpClick
+      TabOrder = 3
+    end
   end
   object pnTop: TPanel
     Left = 0
     Height = 72
     Top = 0
-    Width = 453
+    Width = 580
     Align = alTop
     BevelOuter = bvNone
     ClientHeight = 72
-    ClientWidth = 453
+    ClientWidth = 580
     TabOrder = 0
     Visible = False
     object lbLinkToZip: TLabel
@@ -77,12 +87,12 @@ object CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm
       Left = 15
       Height = 23
       Top = 32
-      Width = 371
+      Width = 498
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 0
     end
     object bTest: TButton
-      Left = 389
+      Left = 516
       Height = 25
       Top = 31
       Width = 50
diff --git a/components/onlinepackagemanager/opkman_createjsonforupdates.pas b/components/onlinepackagemanager/opkman_createjsonforupdates.pas
index ba6237313a..97d3535224 100644
--- a/components/onlinepackagemanager/opkman_createjsonforupdates.pas
+++ b/components/onlinepackagemanager/opkman_createjsonforupdates.pas
@@ -16,6 +16,7 @@ type
   TCreateJSONForUpdatesFrm = class(TForm)
     bClose: TButton;
     bCreate: TButton;
+    bHelp: TButton;
     bTest: TButton;
     cbOpen: TCheckBox;
     edLinkToZip: TEdit;
@@ -25,6 +26,7 @@ type
     pnButtons: TPanel;
     SD: TSaveDialog;
     procedure bCreateClick(Sender: TObject);
+    procedure bHelpClick(Sender: TObject);
     procedure bTestClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -72,6 +74,7 @@ begin
   lbLinkToZip.Caption := rsCreateJSONForUpdatesFrm_lbLinkToZip_Caption;
   bTest.Caption := rsCreateJSONForUpdatesFrm_bTest_Caption;
   bCreate.Caption := rsCreateJSONForUpdatesFrm_bCreate_Caption;
+  bHelp.Caption := rsCreateJSONForUpdatesFrm_bHelp_Caption;
   bClose.Caption := rsCreateJSONForUpdatesFrm_bClose_Caption;
   cbOpen.Caption := rsCreateJSONForUpdatesFrm_cbOpen_Caption;
 
@@ -229,6 +232,11 @@ begin
   end;
 end;
 
+procedure TCreateJSONForUpdatesFrm.bHelpClick(Sender: TObject);
+begin
+  OpenURL(cHelpPage_CreateExternalJSON);
+end;
+
 procedure TCreateJSONForUpdatesFrm.VSTGetText(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
   var CellText: String);
diff --git a/components/onlinepackagemanager/opkman_createrepositorypackage.lfm b/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
index d7f06a2117..3518623eff 100644
--- a/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
+++ b/components/onlinepackagemanager/opkman_createrepositorypackage.lfm
@@ -17,66 +17,5 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
   LCLVersion = '1.7'
   inline frCreateRep: TCreateRepositoryPackagefr
     Align = alClient
-    Visible = True
-    inherited pnData: TPanel
-      inherited pnPackageData: TPanel
-        inherited edSupportedWidgetset: TEdit
-          Width = 296
-        end
-        inherited edLazCompatibility: TEdit
-          Width = 297
-        end
-        inherited edFPCCompatibility: TEdit
-          Width = 296
-        end
-        inherited lbOF1: TLabel
-          Left = 469
-        end
-        inherited lbOF3: TLabel
-          Left = 469
-        end
-        inherited lbOF4: TLabel
-          Left = 469
-        end
-      end
-      inherited pnCategory: TPanel
-        inherited lbOF2: TLabel
-          Left = 469
-        end
-        inherited edHomePageURL: TEdit
-          Width = 296
-        end
-        inherited edDownloadURL: TEdit
-          Width = 296
-        end
-        inherited edSVNURL: TEdit
-          Width = 296
-        end
-        inherited edDisplayName: TEdit
-          Width = 296
-        end
-        inherited pnCategories: TPanel
-          Width = 296
-          ClientWidth = 296
-          inherited spCategories: TSpeedButton
-            Left = 266
-          end
-          inherited edCategories: TEdit
-            Width = 266
-          end
-        end
-      end
-    end
-    inherited pnButtons: TPanel
-      inherited bCreate: TButton
-        Left = 580
-      end
-      inherited bCancel: TButton
-        Left = 657
-      end
-      inherited bOptions: TButton
-        Left = 502
-      end
-    end
   end
 end
diff --git a/components/onlinepackagemanager/opkman_optionsfrm.lfm b/components/onlinepackagemanager/opkman_optionsfrm.lfm
index 6cb81a1f53..28d19b487d 100644
--- a/components/onlinepackagemanager/opkman_optionsfrm.lfm
+++ b/components/onlinepackagemanager/opkman_optionsfrm.lfm
@@ -497,6 +497,7 @@ object OptionsFrm: TOptionsFrm
               ParentShowHint = False
               ScrollWidth = 161
               ShowHint = True
+              Sorted = True
               TabOrder = 2
             end
           end
@@ -584,6 +585,7 @@ object OptionsFrm: TOptionsFrm
               ParentShowHint = False
               ScrollWidth = 154
               ShowHint = True
+              Sorted = True
               TabOrder = 2
             end
           end