diff --git a/.gitattributes b/.gitattributes
index 73ac9bdec1..ba1358317f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -332,6 +332,10 @@ components/editortoolbar/images/preferences16.xpm -text svneol=unset#image/x-xpi
 components/editortoolbar/jumpto.pas svneol=native#text/plain
 components/editortoolbar/jumpto_impl.pas svneol=native#text/plain
 components/editortoolbar/toolbar.lrs svneol=native#text/pascal
+components/education/educationlaz.lpk svneol=native#text/plain
+components/education/educationlaz.pas svneol=native#text/plain
+components/education/eduoptionsdlg.lfm svneol=native#text/plain
+components/education/eduoptionsdlg.pas svneol=native#text/plain
 components/filebrowser/frmconfigfilebrowser.lfm svneol=native#text/plain
 components/filebrowser/frmconfigfilebrowser.lrs svneol=native#text/pascal
 components/filebrowser/frmconfigfilebrowser.pp svneol=native#text/plain
diff --git a/components/README.txt b/components/README.txt
index 9d78362809..62c2fe24b9 100644
--- a/components/README.txt
+++ b/components/README.txt
@@ -30,6 +30,9 @@ dbexport
 editortoolbar
   A customizable tolbar for the source editor.
 
+educationlaz
+  Extends/configures the IDE for education, training, courses
+
 filebrowser
   A file browser window for the IDE.
 
diff --git a/components/education/educationlaz.lpk b/components/education/educationlaz.lpk
new file mode 100644
index 0000000000..b52c2f5ff5
--- /dev/null
+++ b/components/education/educationlaz.lpk
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="3">
+    <Name Value="EducationLaz"/>
+    <Author Value="Mattias Gaertner"/>
+    <CompilerOptions>
+      <Version Value="8"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
+      </SearchPaths>
+      <Other>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="IDE package for training, courses and education."/>
+    <License Value="LGPL-2 or any later"/>
+    <Version Major="1" Release="1"/>
+    <Files Count="1">
+      <Item1>
+        <Filename Value="eduoptionsdlg.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="EduOptionsDlg"/>
+      </Item1>
+    </Files>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="languages"/>
+    </i18n>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="3">
+      <Item1>
+        <PackageName Value="LCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="IDEIntf"/>
+      </Item2>
+      <Item3>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item3>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)/"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/education/educationlaz.pas b/components/education/educationlaz.pas
new file mode 100644
index 0000000000..309d2c7059
--- /dev/null
+++ b/components/education/educationlaz.pas
@@ -0,0 +1,21 @@
+{ This file was automatically created by Lazarus. do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit EducationLaz; 
+
+interface
+
+uses
+  EduOptionsDlg, LazarusPackageIntf;
+
+implementation
+
+procedure Register; 
+begin
+  RegisterUnit('EduOptionsDlg', @EduOptionsDlg.Register); 
+end; 
+
+initialization
+  RegisterPackage('EducationLaz', @Register); 
+end.
diff --git a/components/education/eduoptionsdlg.lfm b/components/education/eduoptionsdlg.lfm
new file mode 100644
index 0000000000..bcc12c7779
--- /dev/null
+++ b/components/education/eduoptionsdlg.lfm
@@ -0,0 +1,38 @@
+object EduOptionsDialog: TEduOptionsDialog
+  Left = 298
+  Height = 382
+  Top = 170
+  Width = 554
+  Caption = 'EduOptionsDialog'
+  ClientHeight = 382
+  ClientWidth = 554
+  OnCreate = FormCreate
+  LCLVersion = '0.9.27'
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 33
+    Top = 343
+    Width = 542
+    TabOrder = 0
+    ShowButtons = [pbOK, pbCancel, pbHelp]
+  end
+  object FramesTreeView: TTreeView
+    Left = 6
+    Height = 331
+    Top = 6
+    Width = 186
+    Align = alLeft
+    BorderSpacing.Around = 6
+    DefaultItemHeight = 19
+    TabOrder = 1
+  end
+  object FramePanel: TPanel
+    Left = 198
+    Height = 337
+    Top = 0
+    Width = 356
+    Align = alClient
+    Caption = 'FramePanel'
+    TabOrder = 2
+  end
+end
diff --git a/components/education/eduoptionsdlg.pas b/components/education/eduoptionsdlg.pas
new file mode 100644
index 0000000000..07da40920f
--- /dev/null
+++ b/components/education/eduoptionsdlg.pas
@@ -0,0 +1,74 @@
+{
+ *****************************************************************************
+ *                                                                           *
+ *  This file is part of the EducationLaz package                            *
+ *                                                                           *
+ *  See the file COPYING.modifiedLGPL.txt, 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: Mattias Gaertner
+
+  Abstract:
+    Dialog to setup the education package.
+}
+unit EduOptionsDlg;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+  ButtonPanel, ComCtrls, ExtCtrls;
+
+type
+
+  { TEduOptionsDialog }
+
+  TEduOptionsDialog = class(TForm)
+    ButtonPanel1: TButtonPanel;
+    FramePanel: TPanel;
+    FramesTreeView: TTreeView;
+    procedure ButtonPanel1Click(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+  private
+    { private declarations }
+  public
+    { public declarations }
+  end; 
+
+var
+  EduOptionsDialog: TEduOptionsDialog;
+
+procedure Register;
+
+implementation
+
+procedure Register;
+begin
+
+end;
+
+{ TEduOptionsDialog }
+
+procedure TEduOptionsDialog.FormCreate(Sender: TObject);
+begin
+  ButtonPanel1.OKButton.OnClick:=@ButtonPanel1Click;
+end;
+
+procedure TEduOptionsDialog.ButtonPanel1Click(Sender: TObject);
+begin
+
+end;
+
+initialization
+  {$I eduoptionsdlg.lrs}
+
+end.
+