diff --git a/components/geckoport/Components/GeckoComponentsFP.lpk b/components/geckoport/Components/GeckoComponentsFP.lpk
new file mode 100755
index 000000000..e15f4cf76
--- /dev/null
+++ b/components/geckoport/Components/GeckoComponentsFP.lpk
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="3">
+    <Name Value="GeckoComponentsFP"/>
+    <AddToProjectUsesSection Value="False"/>
+    <Author Value="Gecko Components for Delphi; ported to Lazarus by Phil Hess"/>
+    <CompilerOptions>
+      <Version Value="9"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
+      </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
+          <IncludeAssertionCode Value="True"/>
+          <AllowLabel Value="False"/>
+          <CPPInline Value="False"/>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Checks>
+          <IOChecks Value="True"/>
+          <RangeChecks Value="True"/>
+          <OverflowChecks Value="True"/>
+          <StackChecks Value="True"/>
+        </Checks>
+        <VerifyObjMethodCallValidity Value="True"/>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="True"/>
+          <UseHeaptrc Value="True"/>
+        </Debugging>
+      </Linking>
+      <Other>
+        <WriteFPCLogo Value="False"/>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="Gecko Components for Lazarus"/>
+    <License Value="MPL 1.1"/>
+    <Version Release="3"/>
+    <Files Count="5">
+      <Item1>
+        <Filename Value="GeckoBrowser.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="GeckoBrowser"/>
+      </Item1>
+      <Item2>
+        <Filename Value="GeckoChromeWindow.lfm"/>
+        <Type Value="LFM"/>
+      </Item2>
+      <Item3>
+        <Filename Value="GeckoChromeWindow.lrs"/>
+        <Type Value="LRS"/>
+      </Item3>
+      <Item4>
+        <Filename Value="GeckoChromeWindow.pas"/>
+        <UnitName Value="GeckoChromeWindow"/>
+      </Item4>
+      <Item5>
+        <Filename Value="GeckoInit.pas"/>
+        <UnitName Value="GeckoInit"/>
+      </Item5>
+    </Files>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="2">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="IDEIntf"/>
+      </Item2>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)/"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/geckoport/fpmake.pp b/components/geckoport/fpmake.pp
new file mode 100644
index 000000000..84b72bd38
--- /dev/null
+++ b/components/geckoport/fpmake.pp
@@ -0,0 +1,174 @@
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+
+begin
+  With Installer do
+    begin
+    P:=AddPackage('gecko');
+
+    P.Version:='0.9.0-1';
+    P.OSes:=AllUnixOSes+[Win32,Win64];
+    P.Author := 'Takanori Ito';
+    P.License := 'MPL 1.1';
+    P.HomepageURL := 'http://wiki.lazarus.freepascal.org/GeckoPort';
+    P.Email := 'joshyfun@gmail.com';
+    P.Description := 'Gecko headers and components to use Gecko in Free Pascal or Lazarus using XPCom.';
+    P.Options.add('-Sm');
+    P.Options.add('-Sd');
+
+    P.Dependencies.Add('fcl-registry',AllWindowsOSes);
+
+    P.Targets.AddUnit('nsTypes.pas');
+    P.Targets.AddUnit('nsCID.pas');
+    P.Targets.AddUnit('nsConsts.pas');
+
+    with P.Targets.AddUnit('nsGeckoStrings.pas') do
+      begin
+      Dependencies.AddUnit('nsInit');
+      Dependencies.AddUnit('nsMemory');
+      Dependencies.AddUnit('nsError');
+      end;
+
+    with P.Targets.AddUnit('nsInit.pas') do
+      begin
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsConsts');
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsGeckoStrings');
+      end;
+
+    with P.Targets.AddUnit('nsXPCOM.pas') do
+      begin
+      Dependencies.AddUnit('nsGeckoStrings');
+      Dependencies.AddUnit('nsTypes');
+      end;
+
+    with P.Targets.AddUnit('nsError.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      end;
+
+    with P.Targets.AddUnit('nsErrorUtils.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsInit');
+      Dependencies.AddUnit('nsXPCOMGlue');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsConsts');
+      Dependencies.AddUnit('nsError');
+      end;
+
+    with P.Targets.AddUnit('nsMemory.pas') do
+      begin
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsError');
+      Dependencies.AddUnit('nsInit');
+      end;
+
+    with P.Targets.AddUnit('nsXPCOMGlue.pas') do
+      begin
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsTypes');
+      ResourceStrings := true;
+      end;
+
+    // Is this unit used at all?!?
+    with P.Targets.AddUnit('nsProfile.pas',AllWindowsOSes) do
+      begin
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsXPCOMGlue');
+      Dependencies.AddUnit('nsTypes');
+      end;
+
+    with P.Targets.AddUnit('nsEnumerators.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsXPCOM_std19');
+      end;
+
+    with P.Targets.AddUnit('each-version\nsXPCOM_std19.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsGeckoStrings');
+      end;
+
+    with P.Targets.AddUnit('nsNetUtil.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsGeckoStrings');
+      Dependencies.AddUnit('nsConsts');
+      Dependencies.AddUnit('nsXPCOMGlue');
+      Dependencies.AddUnit('nsError');
+      Dependencies.AddUnit('nsInit');
+      ResourceStrings := true;
+      end;
+
+    with P.Targets.AddUnit('nsStream.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsError');
+      end;
+
+    with P.Targets.AddUnit('nsXRE.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsGeckoStrings');
+      Dependencies.AddUnit('nsError');
+      Dependencies.AddUnit('nsInit');
+      end;
+
+{    with P.Targets.AddUnit('nsThreadUtil.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsXPCOM');
+      Dependencies.AddUnit('nsGeckoStrings');
+      Dependencies.AddUnit('nsError');
+      end;}
+
+{    with P.Targets.AddUnit('each-version\nsXPCOM_safe19.pas') do
+      begin
+      Dependencies.AddUnit('nsTypes');
+      Dependencies.AddUnit('nsConsts');
+      Dependencies.AddUnit('nsGeckoStrings');
+      end;}
+
+    P.Targets.AddExampleProgram('SampleApps/ChromeWin.dpr');
+    P.Sources.AddExample('SampleApps/ChromeWin.dpr','examples');
+    P.Sources.AddExample('SampleApps/ChromeWin.lpi','examples');
+    P.Sources.AddExample('SampleApps/gec10.pas','examples');
+    P.Sources.AddExample('SampleApps/gec10.lfm','examples');
+    P.Sources.AddExample('SampleApps/lb-cw-cocoa.sh','examples');
+    P.Sources.AddExample('SampleApps/lb-gb-cocoa.sh','examples');
+    P.Sources.AddExample('SampleApps/run-bw-mac.sh','examples');
+    P.Sources.AddExample('SampleApps/run-cw-mac.sh','examples');
+    P.Sources.AddExample('SampleApps/run-gb-mac.sh','examples');
+    P.Sources.AddExample('SampleApps/GBrowser.lpi','examples');
+    P.Sources.AddExample('SampleApps/GBrowser.dpr','examples');
+
+    P.Sources.AddDoc('Components/GeckoComponentsFP.lpk','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/BrowserSupports.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/CallbackInterfaces.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoBrowser.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoBrowser.lrs','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoChromeWindow.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoChromeWindow.lfm','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoChromeWindow.lrs','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoComponents.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoDirectoryService.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoInit.pas','lazaruspackage/Components');
+    P.Sources.AddDoc('Components/GeckoSimpleProfile.pas','lazaruspackage/Components');
+
+    Run;
+    end;
+end.
+