diff --git a/components/rgbgraphics/lazrgbgraphics.lpk b/components/rgbgraphics/lazrgbgraphics.lpk
index 120ddf7e0..f55265395 100644
--- a/components/rgbgraphics/lazrgbgraphics.lpk
+++ b/components/rgbgraphics/lazrgbgraphics.lpk
@@ -1,72 +1,73 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="LazRGBGraphics"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="Tom Gregorovic (_tom_@centrum.cz)"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="include\"/>
+        <IncludeFiles Value="include"/>
+        <OtherUnitFiles Value="source"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
-        <LCLWidgetType Value="gtk2"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
       <Linking>
         <Debugging>
-          <GenerateDebugInfo Value="True"/>
+          <DebugInfoType Value="dsStabs"/>
         </Debugging>
       </Linking>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="This package provides fast in memory image processing and pixel manipulations (like scan line).
 "/>
     <License Value="Modified LGPL
 "/>
-    <Version Minor="2" Release="2"/>
+    <Version Major="1"/>
     <Files Count="8">
       <Item1>
-        <Filename Value="rgbgraphics.pas"/>
+        <Filename Value="source\rgbgraphics.pas"/>
         <UnitName Value="RGBGraphics"/>
       </Item1>
       <Item2>
-        <Filename Value="rgbutils.pas"/>
+        <Filename Value="source\rgbutils.pas"/>
         <UnitName Value="RGBUtils"/>
       </Item2>
       <Item3>
-        <Filename Value="rgbtypes.pas"/>
+        <Filename Value="source\rgbtypes.pas"/>
         <UnitName Value="RGBTypes"/>
       </Item3>
       <Item4>
-        <Filename Value="rgbroutines.pas"/>
+        <Filename Value="source\rgbroutines.pas"/>
         <UnitName Value="RGBRoutines"/>
       </Item4>
       <Item5>
-        <Filename Value="rgbwinroutines.pas"/>
+        <Filename Value="source\rgbwinroutines.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="RGBWinRoutines"/>
       </Item5>
       <Item6>
-        <Filename Value="rgbgtkroutines.pas"/>
+        <Filename Value="source\rgbgtkroutines.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="RGBGTKRoutines"/>
       </Item6>
       <Item7>
-        <Filename Value="rgbcarbonroutines.pas"/>
+        <Filename Value="source\rgbcarbonroutines.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="RGBCarbonRoutines"/>
       </Item7>
       <Item8>
-        <Filename Value="rgbqtroutines.pas"/>
+        <Filename Value="source\rgbqtroutines.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="RGBQtRoutines"/>
       </Item8>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="LCL"/>
@@ -77,12 +78,11 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
-      <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
 </CONFIG>
diff --git a/components/rgbgraphics/lazrgbgraphics.pas b/components/rgbgraphics/lazrgbgraphics.pas
index 444f2d8cb..1ba57ff34 100644
--- a/components/rgbgraphics/lazrgbgraphics.pas
+++ b/components/rgbgraphics/lazrgbgraphics.pas
@@ -1,13 +1,14 @@
 { This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
+  This source is only used to compile and install the package.
  }
 
-unit LazRGBGraphics; 
+unit LazRGBGraphics;
 
+{$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  RGBGraphics, RGBUtils, RGBTypes, RGBRoutines; 
+  RGBGraphics, RGBUtils, RGBTypes, RGBRoutines;
 
 implementation
 
diff --git a/components/rgbgraphics/readme.txt b/components/rgbgraphics/readme.txt
new file mode 100644
index 000000000..94a84aa23
--- /dev/null
+++ b/components/rgbgraphics/readme.txt
@@ -0,0 +1,36 @@
+-------------------------------------------------------------------------------
+                               RGBGraphics
+-------------------------------------------------------------------------------
+
+LazRGBGraphics is a run-time package for fast in memory image processing and 
+pixel manipulations (like scan line). The main advantage is direct memory 
+access to bitmap pixels with keeping ability to draw bitmap onto canvas without 
+any time consuming widgetset memory format converting. 
+
+Details:
+https://wiki.freepascal.org/LazRGBGraphics
+
+
+Installation
+------------
+This is a run-time package - no need to install. Just open it in 
+"Package" > "Open package file (*.lpk)...". This is enough for the IDE to
+know the path to the package files. You may click "Compile" to verify
+the integrity of the package, but strictly speaking this is not necessary.
+
+
+Why are there two packages?
+---------------------------
+Yes, there are two packages, lazrgbgraphics.lpk as well as rgb_graphics.lpk.
+
+lazrgbgraphics is the package by the original author in Lazarus CCR. Pilot Logic
+made a different version, and this eventually made it as rgb_graphics into the 
+Lazarus Online-Package-Manager.
+
+Both packages have the same content and differ only by their name. Since
+they are runtime packages the IDE accepts both of them. This way the risk of
+breaking user code is minimized.
+
+For new users, however, it is recommended to use lazrgbgraphics.lpk only 
+because the other one may be removed from the installation at some time 
+in the future.
diff --git a/components/rgbgraphics/rgb_graphics.lpk b/components/rgbgraphics/rgb_graphics.lpk
new file mode 100644
index 000000000..9eee977dd
--- /dev/null
+++ b/components/rgbgraphics/rgb_graphics.lpk
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Package Version="4">
+    <PathDelim Value="\"/>
+    <Name Value="rgb_graphics"/>
+    <Author Value="Tom Gregorovic"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <IncludeFiles Value="source"/>
+        <OtherUnitFiles Value="source"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
+      </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+    </CompilerOptions>
+    <Description Value="RGBGraphics
+"/>
+    <License Value="Modified LGPL
+"/>
+    <Version Major="1"/>
+    <Files Count="4">
+      <Item1>
+        <Filename Value="source\rgbgraphics.pas"/>
+        <UnitName Value="RGBGraphics"/>
+      </Item1>
+      <Item2>
+        <Filename Value="source\rgbroutines.pas"/>
+        <UnitName Value="RGBRoutines"/>
+      </Item2>
+      <Item3>
+        <Filename Value="source\rgbtypes.pas"/>
+        <UnitName Value="RGBTypes"/>
+      </Item3>
+      <Item4>
+        <Filename Value="source\rgbutils.pas"/>
+        <UnitName Value="RGBUtils"/>
+      </Item4>
+    </Files>
+    <RequiredPkgs Count="2">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="FCL"/>
+        <MaxVersion Major="1"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item2>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/rgbgraphics/rgb_graphics.pas b/components/rgbgraphics/rgb_graphics.pas
new file mode 100644
index 000000000..7f7606709
--- /dev/null
+++ b/components/rgbgraphics/rgb_graphics.pas
@@ -0,0 +1,15 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit rgb_graphics;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  RGBGraphics, RGBRoutines, RGBTypes, RGBUtils;
+
+implementation
+
+end.
diff --git a/components/rgbgraphics/rgbcarbonroutines.pas b/components/rgbgraphics/source/rgbcarbonroutines.pas
similarity index 100%
rename from components/rgbgraphics/rgbcarbonroutines.pas
rename to components/rgbgraphics/source/rgbcarbonroutines.pas
diff --git a/components/rgbgraphics/rgbgraphics.pas b/components/rgbgraphics/source/rgbgraphics.pas
similarity index 100%
rename from components/rgbgraphics/rgbgraphics.pas
rename to components/rgbgraphics/source/rgbgraphics.pas
diff --git a/components/rgbgraphics/rgbgtk3routines.pas b/components/rgbgraphics/source/rgbgtk3routines.pas
similarity index 100%
rename from components/rgbgraphics/rgbgtk3routines.pas
rename to components/rgbgraphics/source/rgbgtk3routines.pas
diff --git a/components/rgbgraphics/rgbgtkroutines.pas b/components/rgbgraphics/source/rgbgtkroutines.pas
similarity index 100%
rename from components/rgbgraphics/rgbgtkroutines.pas
rename to components/rgbgraphics/source/rgbgtkroutines.pas
diff --git a/components/rgbgraphics/rgbqtroutines.pas b/components/rgbgraphics/source/rgbqtroutines.pas
similarity index 100%
rename from components/rgbgraphics/rgbqtroutines.pas
rename to components/rgbgraphics/source/rgbqtroutines.pas
diff --git a/components/rgbgraphics/rgbroutines.pas b/components/rgbgraphics/source/rgbroutines.pas
similarity index 100%
rename from components/rgbgraphics/rgbroutines.pas
rename to components/rgbgraphics/source/rgbroutines.pas
diff --git a/components/rgbgraphics/rgbtypes.pas b/components/rgbgraphics/source/rgbtypes.pas
similarity index 100%
rename from components/rgbgraphics/rgbtypes.pas
rename to components/rgbgraphics/source/rgbtypes.pas
diff --git a/components/rgbgraphics/rgbutils.pas b/components/rgbgraphics/source/rgbutils.pas
similarity index 100%
rename from components/rgbgraphics/rgbutils.pas
rename to components/rgbgraphics/source/rgbutils.pas
diff --git a/components/rgbgraphics/rgbwinroutines.pas b/components/rgbgraphics/source/rgbwinroutines.pas
similarity index 100%
rename from components/rgbgraphics/rgbwinroutines.pas
rename to components/rgbgraphics/source/rgbwinroutines.pas