diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 7f6c97b00b..66dacea619 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -102,10 +102,11 @@ const
       'i386', 'powerpc', 'm68k', 'x86_64', 'sparc', 'arm'
     );
 
-  Lazarus_CPU_OS_Widget_Combinations: array[1..30] of shortstring = (
+  Lazarus_CPU_OS_Widget_Combinations: array[1..35] of shortstring = (
     'i386-linux-gtk',
     'i386-linux-gtk2',
     'i386-linux-qt',
+    'i386-linux-fpgui',
     'i386-freebsd-gtk',
     'i386-freebsd-gtk2',
     'i386-freebsd-qt',
@@ -117,7 +118,9 @@ const
     'i386-netbsd-qt',
     'i386-win32-win32',
     'i386-win32-gtk2',
+    'i386-win32-fpgui',
     'i386-wince-wince',
+    'i386-wince-fpgui',
     'i386-darwin-gtk',
     'i386-darwin-gtk2',
     'i386-darwin-carbon',
@@ -130,9 +133,11 @@ const
     'sparc-linux-gtk',
     'sparc-linux-gtk2',
     'arm-wince-wince',
+    'arm-wince-fpgui',
     'x86_64-linux-gtk',
     'x86_64-linux-gtk2',
-    'x86_64-linux-qt'
+    'x86_64-linux-qt',
+    'x86_64-linux-fpgui'
     );
 
 type
@@ -4238,6 +4243,9 @@ begin
       ctsDefineMacroQT1,'qt1','',da_Define));
   SubDirTempl.AddChild(IntfDirTemplate);
 
+  // <LazarusSrcDir>/lcl/interfaces/fpgui
+  // no special
+
   // <LazarusSrcDir>/components
   DirTempl:=TDefineTemplate.Create('Components',ctsComponentsDirectory,
     '','components',da_Directory);
diff --git a/components/opengl/example/testopenglcontext1.lpi b/components/opengl/example/testopenglcontext1.lpi
index 6a1410c5ac..12b5ce6135 100644
--- a/components/opengl/example/testopenglcontext1.lpi
+++ b/components/opengl/example/testopenglcontext1.lpi
@@ -11,33 +11,8 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=""/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
-    <LazDoc Paths=""/>
-    <Units Count="2">
-      <Unit0>
-        <CursorPos X="1" Y="14"/>
-        <EditorIndex Value="3"/>
-        <Filename Value="testopenglcontext1.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1"/>
-        <UnitName Value="TestOpenGLContext1"/>
-        <UsageCount Value="141"/>
-      </Unit0>
-      <Unit1>
-        <CursorPos X="9" Y="107"/>
-        <EditorIndex Value="0"/>
-        <Filename Value="mainunit.pas"/>
-        <ComponentName Value="Form1"/>
-        <IsPartOfProject Value="True"/>
-        <Loaded Value="True"/>
-        <ResourceFilename Value="mainunit.lrs"/>
-        <TopLine Value="96"/>
-        <UnitName Value="MainUnit"/>
-        <UsageCount Value="141"/>
-      </Unit1>
-    </Units>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -50,17 +25,38 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="3">
+    <RequiredPackages Count="2">
       <Item1>
         <PackageName Value="LCL"/>
       </Item1>
       <Item2>
         <PackageName Value="LazOpenGLContext"/>
       </Item2>
-      <Item3>
-        <PackageName Value="gdk2x11"/>
-      </Item3>
     </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="testopenglcontext1.lpr"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestOpenGLContext1"/>
+        <CursorPos X="54" Y="8"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="142"/>
+        <Loaded Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="mainunit.pas"/>
+        <ComponentName Value="Form1"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceFilename Value="mainunit.lrs"/>
+        <UnitName Value="MainUnit"/>
+        <CursorPos X="19" Y="20"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="142"/>
+        <Loaded Value="True"/>
+      </Unit1>
+    </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
diff --git a/components/opengl/example/testopenglcontext1.lpr b/components/opengl/example/testopenglcontext1.lpr
index 8a58c4037a..1d885102b3 100644
--- a/components/opengl/example/testopenglcontext1.lpr
+++ b/components/opengl/example/testopenglcontext1.lpr
@@ -5,7 +5,7 @@ program TestOpenGLContext1;
 uses
   Interfaces, // this includes the LCL widgetset
   Forms
-  { add your units here }, MainUnit, LazOpenGLContext, gdk2x11;
+  { add your units here }, MainUnit, LazOpenGLContext;
 
 begin
   Application.Initialize;
diff --git a/ide/lazconf.pp b/ide/lazconf.pp
index e4d8e089bf..ce73d21da0 100644
--- a/ide/lazconf.pp
+++ b/ide/lazconf.pp
@@ -55,13 +55,14 @@ type
     lpWin32,
     lpWinCE,
     lpCarbon,
-    lpQT
+    lpQT,
+    lpfpGUI
     );
   TLCLPlatforms = set of TLCLPlatform;
   
 const
   LCLPlatformNames: array[TLCLPlatform] of string = (
-      'gtk', 'gtk2', 'win32', 'wince', 'carbon', 'qt'
+      'gtk', 'gtk2', 'win32', 'wince', 'carbon', 'qt', 'fpgui'
     );