diff --git a/.gitattributes b/.gitattributes
index 862de1ecc8..14ff83ac07 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -94,6 +94,11 @@ components/jpeg/jpegforlazarus.lpk svneol=native#text/pascal
 components/jpeg/jpegforlazarus.pas svneol=native#text/pascal
 components/jpeg/lazjpeg.pas svneol=native#text/pascal
 components/jpeg/readme.txt svneol=native#text/plain
+components/memds/memdslaz.lpk svneol=native#text/pascal
+components/memds/memdslaz.pas svneol=native#text/pascal
+components/memds/registermemds.lrs svneol=native#text/pascal
+components/memds/registermemds.pas svneol=native#text/pascal
+components/memds/tmemdataset.xpm -text svneol=native#image/x-xpixmap
 components/mpaslex/mpaslex.pp svneol=native#text/pascal
 components/mysql/mysqllaz.lpk svneol=native#text/pascal
 components/mysql/mysqllaz.pas svneol=native#text/pascal
diff --git a/components/memds/lib/README b/components/memds/lib/README
new file mode 100644
index 0000000000..fc5dc8547b
--- /dev/null
+++ b/components/memds/lib/README
@@ -0,0 +1,2 @@
+Output directory for the MemDSLaz package.
+
diff --git a/components/memds/memdslaz.lpk b/components/memds/memdslaz.lpk
new file mode 100644
index 0000000000..bf3d16f099
--- /dev/null
+++ b/components/memds/memdslaz.lpk
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="2">
+    <Name Value="MemDSLaz"/>
+    <Author Value="Michael Van Canneyt"/>
+    <CompilerOptions>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib/"/>
+      </SearchPaths>
+      <Other>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="Memory (TMemDataset) dataset package for Lazarus"/>
+    <License Value="LGPL"/>
+    <Version Minor="1" Release="1"/>
+    <Files Count="3">
+      <Item1>
+        <Filename Value="registermemds.lrs"/>
+        <Type Value="LRS"/>
+      </Item1>
+      <Item2>
+        <Filename Value="registermemds.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="registermemds"/>
+      </Item2>
+      <Item3>
+        <Filename Value="memds.pp"/>
+        <Type Value="Virtual Unit"/>
+        <UnitName Value="memds"/>
+      </Item3>
+    </Files>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="1">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)/"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/memds/memdslaz.pas b/components/memds/memdslaz.pas
new file mode 100644
index 0000000000..e7158fa78d
--- /dev/null
+++ b/components/memds/memdslaz.pas
@@ -0,0 +1,22 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install
+  the package MemDSLaz 0.1.1.
+}
+
+unit MemDSLaz; 
+
+interface
+
+uses
+  registermemds, memds, LazarusPackageIntf; 
+
+implementation
+
+procedure Register; 
+begin
+  RegisterUnit('registermemds', @registermemds.Register); 
+end; 
+
+initialization
+  RegisterPackage('MemDSLaz', @Register)
+end.
diff --git a/components/memds/registermemds.lrs b/components/memds/registermemds.lrs
new file mode 100644
index 0000000000..d2152ccec6
--- /dev/null
+++ b/components/memds/registermemds.lrs
@@ -0,0 +1,25 @@
+LazarusResources.Add('tmemdataset','XPM',[
+  '/* XPM */'#10'static char *tsdfdataset[]={'#10'"22 23 51 1",'#10'"a c #00000'
+  +'0",'#10'"t c #000008",'#10'"s c #000010",'#10'"b c #000400",'#10'"c c #0004'
+  +'08",'#10'"u c #000410",'#10'"I c #000800",'#10'"v c #000810",'#10'"J c #000'
+  +'c00",'#10'"# c #080408",'#10'"V c #080800",'#10'"T c #080808",'#10'"r c #08'
+  +'0c00",'#10'"F c #296929",'#10'"i c #bdbebd",'#10'"n c #bdbec5",'#10'"O c #b'
+  +'dbecd",'#10'"G c #bdc2c5",'#10'"M c #bdc2cd",'#10'"q c #c5c2bd",'#10'"f c #'
+  +'c5c2c5",'#10'"o c #c5c2cd",'#10'"d c #c5c6c5",'#10'"h c #c5c6cd",'#10'"S c '
+  +'#c5c6d5",'#10'"p c #c5cabd",'#10'"U c #c5cad5",'#10'"m c #c5ceb4",'#10'"w c'
+  +' #c5cec5",'#10'"j c #cdc6cd",'#10'"k c #cdcacd",'#10'"g c #cdcad5",'#10'"l '
+  +'c #cdceb4",'#10'"E c #cdcec5",'#10'"e c #cdcecd",'#10'"H c #de1c10",'#10'"Q'
+  +' c #e6eeff",'#10'"R c #eee6ff",'#10'"C c #eeeaff",'#10'"A c #eeeeff",'#10'"'
+  +'N c #eef6ff",'#10'"y c #f6f2ff",'#10'"B c #f6f6ee",'#10'"K c #f6f6ff",'#10
+  +'"z c #f6faff",'#10'"P c #f6ffff",'#10'"D c #fff2ff",'#10'"L c #fff6ff",'#10
+  +'"W c #fffaf6",'#10'"x c #fffaff",'#10'". c #ffffff",'#10'".#aaaaaaabaaabaca'
+  +'abaa.",'#10'".adbefghhiejklmnoplqa.",'#10'".braassstabaaabuvtabb.",'#10'".a'
+  +'wa.xyx..ky.z.A.xy.a.",'#10'".aBb.xxCx.d..aaaaaD.b.",'#10'".aEb.FaFa.G.aHHHH'
+  +'Ha.a.",'#10'".IBJ.KyLL.M.aHNzLHa.a.",'#10'".awazFaaF.O..PPQHHaKI.",'#10'".a'
+  +'.c.xRLAxS..KzHHaK.a.",'#10'".TdazFaaa.UKz.HHaxx.a.",'#10'".a.c.xxAL.o...Hax'
+  +'A..a.",'#10'".Vda.FaaFKh.yyHax...a.",'#10'".azc..K...nW.xKx.K.xa.",'#10'".a'
+  +'ea.x.K.xk.xxHa...xc.",'#10'".aaTaaactttts.Ha.caac.",'#10'".................'
+  +'.....",'#10'".a...a.aaaa.a...a.....",'#10'".aa.aa.a....aa.aa.....",'#10'".a'
+  +'.a.a.aa...a.a.a.....",'#10'".a...a.a....a...a.....",'#10'".a...a.a....a...a'
+  +'.....",'#10'".a...a.aaaa.a...a.....",'#10'"......................"};'#10
+]);
diff --git a/components/memds/registermemds.pas b/components/memds/registermemds.pas
new file mode 100644
index 0000000000..95cc90560d
--- /dev/null
+++ b/components/memds/registermemds.pas
@@ -0,0 +1,44 @@
+{  $Id$  }
+{
+ *****************************************************************************
+ *                                                                           *
+ *  See the file COPYING.modifiedLGPL, included in this distribution,        *
+ *  for details about the copyright.                                         *
+ *                                                                           *
+ *  This program is distributed in the hope that it will be useful,          *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ *****************************************************************************
+
+  Author: Michael Van Canneyt
+  
+  This unit registers the TMemDataset components of the FCL.
+}
+unit registermemds;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, LResources, memds, LazarusPackageIntf;
+
+procedure Register;
+
+implementation
+
+procedure RegisterUnitMemDS;
+begin
+  RegisterComponents('Data Access',[TMemDataset]);
+end;
+
+procedure Register;
+begin
+  RegisterUnit('memds',@RegisterUnitMemDS);
+end;
+
+initialization
+  {$i registermemds.lrs}
+
+end.
diff --git a/components/memds/tmemdataset.xpm b/components/memds/tmemdataset.xpm
new file mode 100644
index 0000000000..d4c368469d
--- /dev/null
+++ b/components/memds/tmemdataset.xpm
@@ -0,0 +1,77 @@
+/* XPM */
+static char *tsdfdataset[]={
+"22 23 51 1",
+"a c #000000",
+"t c #000008",
+"s c #000010",
+"b c #000400",
+"c c #000408",
+"u c #000410",
+"I c #000800",
+"v c #000810",
+"J c #000c00",
+"# c #080408",
+"V c #080800",
+"T c #080808",
+"r c #080c00",
+"F c #296929",
+"i c #bdbebd",
+"n c #bdbec5",
+"O c #bdbecd",
+"G c #bdc2c5",
+"M c #bdc2cd",
+"q c #c5c2bd",
+"f c #c5c2c5",
+"o c #c5c2cd",
+"d c #c5c6c5",
+"h c #c5c6cd",
+"S c #c5c6d5",
+"p c #c5cabd",
+"U c #c5cad5",
+"m c #c5ceb4",
+"w c #c5cec5",
+"j c #cdc6cd",
+"k c #cdcacd",
+"g c #cdcad5",
+"l c #cdceb4",
+"E c #cdcec5",
+"e c #cdcecd",
+"H c #de1c10",
+"Q c #e6eeff",
+"R c #eee6ff",
+"C c #eeeaff",
+"A c #eeeeff",
+"N c #eef6ff",
+"y c #f6f2ff",
+"B c #f6f6ee",
+"K c #f6f6ff",
+"z c #f6faff",
+"P c #f6ffff",
+"D c #fff2ff",
+"L c #fff6ff",
+"W c #fffaf6",
+"x c #fffaff",
+". c #ffffff",
+".#aaaaaaabaaabacaabaa.",
+".adbefghhiejklmnoplqa.",
+".braassstabaaabuvtabb.",
+".awa.xyx..ky.z.A.xy.a.",
+".aBb.xxCx.d..aaaaaD.b.",
+".aEb.FaFa.G.aHHHHHa.a.",
+".IBJ.KyLL.M.aHNzLHa.a.",
+".awazFaaF.O..PPQHHaKI.",
+".a.c.xRLAxS..KzHHaK.a.",
+".TdazFaaa.UKz.HHaxx.a.",
+".a.c.xxAL.o...HaxA..a.",
+".Vda.FaaFKh.yyHax...a.",
+".azc..K...nW.xKx.K.xa.",
+".aea.x.K.xk.xxHa...xc.",
+".aaTaaactttts.Ha.caac.",
+"......................",
+".a...a.aaaa.a...a.....",
+".aa.aa.a....aa.aa.....",
+".a.a.a.aa...a.a.a.....",
+".a...a.a....a...a.....",
+".a...a.a....a...a.....",
+".a...a.aaaa.a...a.....",
+"......................"};