diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index 54cb4b6c07..be5583c8b6 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -1210,9 +1210,9 @@ begin
 
   cbPackageType.Clear;
   cbPackageType.Items.Add('');
-  cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType0);
-  cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType1);
   cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType2);
+  cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType1);
+  cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType0);
   cbPackageType.Items.Add(rsMainFrm_VSTText_PackageType3);
 
   cbPackageState.Clear;
diff --git a/components/onlinepackagemanager/opkman_serializablepackages.pas b/components/onlinepackagemanager/opkman_serializablepackages.pas
index eb646e9e71..059e26ae08 100644
--- a/components/onlinepackagemanager/opkman_serializablepackages.pas
+++ b/components/onlinepackagemanager/opkman_serializablepackages.pas
@@ -875,7 +875,7 @@ begin
        LazarusPkg.LazCompatibility := LazarusPkgsObj.Get('LazCompatibility');
        LazarusPkg.FPCCompatibility := LazarusPkgsObj.Get('FPCCompatibility');
        LazarusPkg.SupportedWidgetSet := LazarusPkgsObj.Get('SupportedWidgetSet');
-       LazarusPkg.PackageType := TLazPackageType(LazarusPkgsObj.Get('PackageType')); // JuMa: Typecast was changed, may break things.
+       LazarusPkg.PackageType := TLazPackageType(LazarusPkgsObj.Get('PackageType'));
        LazarusPkg.DependenciesAsString := LazarusPkgsObj.Get('DependenciesAsString');
       end;
     end;