diff --git a/components/lazbarcodes/demo/LazBarcodeDemo.lpi b/components/lazbarcodes/demo/LazBarcodeDemo.lpi
index 4f4ce34b4..3e291e2dd 100644
--- a/components/lazbarcodes/demo/LazBarcodeDemo.lpi
+++ b/components/lazbarcodes/demo/LazBarcodeDemo.lpi
@@ -12,7 +12,6 @@
       <XPManifest>
         <DpiAware Value="True"/>
       </XPManifest>
-      <Icon Value="0"/>
     </General>
     <BuildModes>
       <Item Name="Default" Default="True"/>
diff --git a/components/lazbarcodes/demo/main.lfm b/components/lazbarcodes/demo/main.lfm
index 3f6f2b57d..55180a8d8 100644
--- a/components/lazbarcodes/demo/main.lfm
+++ b/components/lazbarcodes/demo/main.lfm
@@ -7,7 +7,6 @@ object MainForm: TMainForm
   ClientHeight = 484
   ClientWidth = 811
   OnCreate = FormCreate
-  LCLVersion = '2.3.0.0'
   object BarcodesTree: TTreeView
     Left = 6
     Height = 472
@@ -81,12 +80,12 @@ object MainForm: TMainForm
         Left = 0
         Height = 173
         Top = 35
-        Width = 189
+        Width = 191
         AutoSize = True
         BorderSpacing.Top = 12
         Caption = 'Geometry'
         ClientHeight = 153
-        ClientWidth = 185
+        ClientWidth = 187
         TabOrder = 1
         object lblScale: TLabel
           AnchorSideLeft.Control = gbGeometry
@@ -109,7 +108,7 @@ object MainForm: TMainForm
           Left = 105
           Height = 23
           Top = 46
-          Width = 74
+          Width = 76
           Alignment = taRightJustify
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 8
@@ -127,7 +126,7 @@ object MainForm: TMainForm
           Left = 105
           Height = 23
           Top = 72
-          Width = 74
+          Width = 76
           Alignment = taRightJustify
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 3
@@ -170,7 +169,7 @@ object MainForm: TMainForm
           Left = 105
           Height = 23
           Top = 98
-          Width = 74
+          Width = 76
           Alignment = taRightJustify
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 3
@@ -202,7 +201,7 @@ object MainForm: TMainForm
           Left = 105
           Height = 23
           Top = 124
-          Width = 74
+          Width = 76
           Alignment = taRightJustify
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Left = 12
@@ -220,7 +219,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 19
           Top = 19
-          Width = 163
+          Width = 165
           BorderSpacing.Left = 16
           BorderSpacing.Right = 6
           Caption = 'Recommended symbol size'
@@ -235,7 +234,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 19
           Top = 0
-          Width = 66
+          Width = 68
           BorderSpacing.Left = 16
           Caption = 'Auto size'
           OnChange = cbAutoSizeChange
@@ -246,15 +245,15 @@ object MainForm: TMainForm
         AnchorSideLeft.Control = gbGeometry
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = gbGeometry
-        Left = 205
+        Left = 207
         Height = 74
         Top = 35
-        Width = 213
+        Width = 215
         AutoSize = True
         BorderSpacing.Left = 16
         Caption = 'Show...'
         ClientHeight = 54
-        ClientWidth = 209
+        ClientWidth = 211
         TabOrder = 2
         object cbHumanReadableText: TCheckBox
           AnchorSideLeft.Control = gbShow
@@ -262,7 +261,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 19
           Top = 0
-          Width = 131
+          Width = 133
           BorderSpacing.Left = 16
           Caption = 'Human-readable text'
           Checked = True
@@ -279,7 +278,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 23
           Top = 25
-          Width = 187
+          Width = 189
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Left = 16
           BorderSpacing.Top = 6
@@ -302,7 +301,7 @@ object MainForm: TMainForm
           AnchorSideLeft.Side = asrBottom
           AnchorSideTop.Control = cbHumanReadableText
           AnchorSideTop.Side = asrCenter
-          Left = 153
+          Left = 155
           Height = 25
           Top = -3
           Width = 50
@@ -320,16 +319,16 @@ object MainForm: TMainForm
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = gbShow
         AnchorSideRight.Side = asrBottom
-        Left = 205
+        Left = 207
         Height = 68
         Top = 121
-        Width = 213
+        Width = 215
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Top = 12
         Caption = 'Checksum'
         ClientHeight = 48
-        ClientWidth = 209
+        ClientWidth = 211
         TabOrder = 6
         object cbAddChecksum: TCheckBox
           AnchorSideLeft.Control = gbChecksum
@@ -337,7 +336,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 19
           Top = 0
-          Width = 97
+          Width = 99
           BorderSpacing.Left = 16
           Caption = 'Add checksum'
           Checked = True
@@ -352,7 +351,7 @@ object MainForm: TMainForm
           Left = 16
           Height = 19
           Top = 23
-          Width = 113
+          Width = 115
           BorderSpacing.Top = 4
           BorderSpacing.Bottom = 6
           Caption = 'Display checksum'
@@ -369,13 +368,13 @@ object MainForm: TMainForm
         Left = 0
         Height = 109
         Top = 224
-        Width = 189
+        Width = 191
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Top = 16
         Caption = 'Colors'
         ClientHeight = 89
-        ClientWidth = 185
+        ClientWidth = 187
         TabOrder = 3
         object clbBackground: TColorButton
           AnchorSideLeft.Control = gbColors
@@ -431,7 +430,9 @@ object MainForm: TMainForm
         end
       end
       object btnSaveToFile: TBitBtn
+        AnchorSideLeft.Control = btnCopyToClipboard
         AnchorSideTop.Control = gbColors
+        AnchorSideRight.Control = btnCopyToClipboard
         AnchorSideRight.Side = asrBottom
         Left = 205
         Height = 25
@@ -445,16 +446,14 @@ object MainForm: TMainForm
         TabOrder = 4
       end
       object btnCopyToClipboard: TBitBtn
-        AnchorSideLeft.Control = btnSaveToFile
+        AnchorSideLeft.Control = gbChecksum
         AnchorSideTop.Control = btnSaveToFile
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = btnSaveToFile
         AnchorSideRight.Side = asrBottom
         Left = 205
         Height = 25
         Top = 264
         Width = 128
-        Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Top = 6
         Caption = 'Copy to clipboard'
@@ -479,7 +478,7 @@ object MainForm: TMainForm
         AnchorSideLeft.Control = gbShow
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = gbGeometry
-        Left = 434
+        Left = 438
         Height = 293
         Top = 35
         Width = 152
@@ -532,8 +531,8 @@ object MainForm: TMainForm
             ChildSizing.ShrinkVertical = crsScaleChilds
             ChildSizing.Layout = cclLeftToRightThenTopToBottom
             ChildSizing.ControlsPerLine = 1
-            ClientHeight = 84
-            ClientWidth = 148
+            ClientHeight = 104
+            ClientWidth = 152
             ItemIndex = 0
             Items.Strings = (
               'mod-10'
diff --git a/components/lazbarcodes/packages/lazbarcodes.lpk b/components/lazbarcodes/packages/lazbarcodes.lpk
index 2d731422e..c32f5557c 100644
--- a/components/lazbarcodes/packages/lazbarcodes.lpk
+++ b/components/lazbarcodes/packages/lazbarcodes.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="lazbarcodes"/>
     <Type Value="RunAndDesignTime"/>
@@ -13,20 +13,28 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Description Value="Provides barcode 1D and 2D generation based in the 'C' zint library."/>
-    <Version Major="1" Release="4"/>
-    <Files Count="1">
+    <Description Value="Provides barcode 1D and 2D generation based in the &apos;C&apos; zint library."/>
+    <Version Major="2"/>
+    <Files Count="2">
       <Item1>
         <Filename Value="..\src\ubarcodes.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="ubarcodes"/>
       </Item1>
+      <Item2>
+        <Filename Value="..\src\udrawers.pas"/>
+        <UnitName Value="udrawers"/>
+      </Item2>
     </Files>
-    <RequiredPkgs Count="1">
+    <CompatibilityMode Value="True"/>
+    <RequiredPkgs Count="2">
       <Item1>
+        <PackageName Value="IDEIntf"/>
+      </Item1>
+      <Item2>
         <PackageName Value="lazbarcodes_runtimeonly"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item1>
+      </Item2>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/components/lazbarcodes/packages/lazbarcodes.pas b/components/lazbarcodes/packages/lazbarcodes.pas
index 6e1739473..480beb8fb 100644
--- a/components/lazbarcodes/packages/lazbarcodes.pas
+++ b/components/lazbarcodes/packages/lazbarcodes.pas
@@ -2,20 +2,21 @@
   This source is only used to compile and install the package.
  }
 
-unit lazbarcodes; 
+unit lazbarcodes;
 
+{$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  ubarcodes, LazarusPackageIntf;
+  ubarcodes, udrawers, LazarusPackageIntf;
 
 implementation
 
-procedure Register; 
+procedure Register;
 begin
-  RegisterUnit('ubarcodes', @ubarcodes.Register); 
-end; 
+  RegisterUnit('ubarcodes', @ubarcodes.Register);
+end;
 
 initialization
-  RegisterPackage('lazbarcodes', @Register); 
+  RegisterPackage('lazbarcodes', @Register);
 end.
diff --git a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
index 569b9dd97..6874bfb05 100644
--- a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
+++ b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="lazbarcodes_runtimeonly"/>
     <Author Value="José Mejuto"/>
@@ -8,11 +8,12 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
+        <IncludeFiles Value="..\src"/>
         <OtherUnitFiles Value="..\src"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Description Value="Provides barcode 1D and 2D generation based in the 'C' zint library."/>
+    <Description Value="Provides barcode 1D and 2D generation based in the &apos;C&apos; zint library."/>
     <License Value="BSD 3
 
 ZINT was originally developed by Robin Stuart and licensed under the terms of the GPL (Gnu
@@ -21,15 +22,15 @@ to change the license to a less restrictive one (see ZINT mailing list of May 20
 related mails) under the following conditions:
 - the names of original copyright holder Robin Stuart and contributors are not removed,
   neither from sources nor from the manual
-- the documentation is done in British English (as Robin said: &quot;Oh, and please don't
+- the documentation is done in British English (as Robin said: &quot;Oh, and please don&apos;t
   replace the word &quot;colour&quot; with &quot;color&quot; in the documentation - that really annoys me!&quot;)
 
 Change to BSD-license is done for backend and therefore for ZINT shared library only, for
 the frontends and Qt4-backend the GPL is still valid. Since BSD-license is GPL-compatible
 this gives the possibility to include ZINT library in own products or link against it from
 own software."/>
-    <Version Major="1" Release="4"/>
-    <Files Count="9">
+    <Version Major="2"/>
+    <Files Count="22">
       <Item1>
         <Filename Value="..\src\zint.pp"/>
         <UnitName Value="zint"/>
@@ -66,7 +67,60 @@ own software."/>
         <Filename Value="..\src\lbc_sjis.pas"/>
         <UnitName Value="lbc_sjis"/>
       </Item9>
+      <Item10>
+        <Filename Value="..\src\lbc_code.pas"/>
+        <UnitName Value="lbc_code"/>
+      </Item10>
+      <Item11>
+        <Filename Value="..\src\lbc_common.pas"/>
+        <UnitName Value="lbc_common"/>
+      </Item11>
+      <Item12>
+        <Filename Value="..\src\lbc_2of5.pas"/>
+        <UnitName Value="lbc_2of5"/>
+      </Item12>
+      <Item13>
+        <Filename Value="..\src\lbc_upcean.pas"/>
+        <UnitName Value="lbc_upcean"/>
+      </Item13>
+      <Item14>
+        <Filename Value="..\src\lbc_code128.pas"/>
+        <UnitName Value="lbc_code128"/>
+      </Item14>
+      <Item15>
+        <Filename Value="..\src\lbc_gs1.pas"/>
+        <UnitName Value="lbc_gs1"/>
+      </Item15>
+      <Item16>
+        <Filename Value="..\src\lbc_postal.pas"/>
+        <UnitName Value="lbc_postal"/>
+      </Item16>
+      <Item17>
+        <Filename Value="..\src\lbc_svg.pas"/>
+        <UnitName Value="lbc_svg"/>
+      </Item17>
+      <Item18>
+        <Filename Value="..\src\lbc_medical.pas"/>
+        <UnitName Value="lbc_medical"/>
+      </Item18>
+      <Item19>
+        <Filename Value="..\src\lbc_telepen.pas"/>
+        <UnitName Value="lbc_telepen"/>
+      </Item19>
+      <Item20>
+        <Filename Value="..\src\lbc_plessey.pas"/>
+        <UnitName Value="lbc_plessey"/>
+      </Item20>
+      <Item21>
+        <Filename Value="..\src\lbc_pdf417.pas"/>
+        <UnitName Value="lbc_pdf417"/>
+      </Item21>
+      <Item22>
+        <Filename Value="..\src\lbc_auspost.pas"/>
+        <UnitName Value="lbc_auspost"/>
+      </Item22>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="LCLBase"/>
diff --git a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.pas b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.pas
index c2e97ba36..aaabc45bc 100644
--- a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.pas
+++ b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.pas
@@ -8,7 +8,10 @@ unit lazbarcodes_runtimeonly;
 interface
 
 uses
-  zint, lbc_aztec, lbc_basic, lbc_datamatrix, lbc_helper, lbc_qr, lbc_reedsolomon, lbc_render, lbc_sjis;
+  zint, lbc_aztec, lbc_basic, lbc_datamatrix, lbc_helper, lbc_qr, 
+  lbc_reedsolomon, lbc_render, lbc_sjis, lbc_code, lbc_common, lbc_2of5, 
+  lbc_upcean, lbc_code128, lbc_gs1, lbc_postal, lbc_svg, lbc_medical, 
+  lbc_telepen, lbc_plessey, lbc_pdf417, lbc_auspost;
 
 implementation