diff --git a/applications/wikihelp/src/umain.lfm b/applications/wikihelp/src/umain.lfm
index da28322f2..c465fca1e 100644
--- a/applications/wikihelp/src/umain.lfm
+++ b/applications/wikihelp/src/umain.lfm
@@ -11,45 +11,45 @@ object fWikiHelp: TfWikiHelp
   OnCreate = FormCreate
   object lWikiPage: TLabel
     Left = 8
-    Height = 14
+    Height = 16
     Top = 8
-    Width = 44
+    Width = 50
     Caption = 'WikiPage'
     Color = clNone
     ParentColor = False
   end
   object lPageOffset: TLabel
     Left = 8
-    Height = 14
+    Height = 16
     Top = 60
-    Width = 58
+    Width = 62
     Caption = 'lPageOffset'
     Color = clNone
     ParentColor = False
   end
   object eFoundPages: TLabel
     Left = 8
-    Height = 14
+    Height = 16
     Top = 104
-    Width = 66
+    Width = 72
     Caption = 'eFoundPages'
     Color = clNone
     ParentColor = False
   end
   object lOutputDir: TLabel
     Left = 8
-    Height = 14
+    Height = 16
     Top = 240
-    Width = 51
+    Width = 57
     Caption = 'Output Dir'
     Color = clNone
     ParentColor = False
   end
   object lLanguage: TLabel
     Left = 288
-    Height = 14
+    Height = 16
     Top = 8
-    Width = 48
+    Width = 53
     Caption = 'Language'
     Color = clNone
     ParentColor = False
@@ -137,9 +137,9 @@ object fWikiHelp: TfWikiHelp
   end
   object cbAddLinkedPages: TCheckBox
     Left = 8
-    Height = 13
+    Height = 15
     Top = 220
-    Width = 103
+    Width = 105
     Caption = 'Add linked Pages'
     TabOrder = 7
   end
diff --git a/applications/wikihelp/src/umain.lrs b/applications/wikihelp/src/umain.lrs
index a0cb397a7..01be61331 100644
--- a/applications/wikihelp/src/umain.lrs
+++ b/applications/wikihelp/src/umain.lrs
@@ -5,15 +5,15 @@ LazarusResources.Add('TfWikiHelp','FORMDATA',[
   +#221#0#5'Width'#3#172#1#18'HorzScrollBar.Page'#3#171#1#18'VertScrollBar.Page'
   +#3'A'#1#13'ActiveControl'#7#9'eWikiPage'#7'Caption'#6#8'WikiHelp'#7'OnClose'
   +#7#9'FormClose'#8'OnCreate'#7#10'FormCreate'#0#6'TLabel'#9'lWikiPage'#4'Left'
-  +#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2','#7'Caption'#6#8'WikiPage'#5'Colo'
+  +#2#8#6'Height'#2#16#3'Top'#2#8#5'Width'#2'2'#7'Caption'#6#8'WikiPage'#5'Colo'
   +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#11'lPageOffset'#4'Left'#2#8#6
-  +'Height'#2#14#3'Top'#2'<'#5'Width'#2':'#7'Caption'#6#11'lPageOffset'#5'Color'
+  +'Height'#2#16#3'Top'#2'<'#5'Width'#2'>'#7'Caption'#6#11'lPageOffset'#5'Color'
   +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#11'eFoundPages'#4'Left'#2#8#6'H'
-  +'eight'#2#14#3'Top'#2'h'#5'Width'#2'B'#7'Caption'#6#11'eFoundPages'#5'Color'
+  +'eight'#2#16#3'Top'#2'h'#5'Width'#2'H'#7'Caption'#6#11'eFoundPages'#5'Color'
   +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#10'lOutputDir'#4'Left'#2#8#6'He'
-  +'ight'#2#14#3'Top'#3#240#0#5'Width'#2'3'#7'Caption'#6#10'Output Dir'#5'Color'
+  +'ight'#2#16#3'Top'#3#240#0#5'Width'#2'9'#7'Caption'#6#10'Output Dir'#5'Color'
   +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#9'lLanguage'#4'Left'#3' '#1#6'H'
-  +'eight'#2#14#3'Top'#2#8#5'Width'#2'0'#7'Caption'#6#8'Language'#5'Color'#7#6
+  +'eight'#2#16#3'Top'#2#8#5'Width'#2'5'#7'Caption'#6#8'Language'#5'Color'#7#6
   +'clNone'#11'ParentColor'#8#0#0#5'TEdit'#9'eWikiPage'#4'Left'#2#8#6'Height'#2
   +#23#3'Top'#2#28#5'Width'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
   +#8'TabOrder'#2#0#4'Text'#6'!http://www.ullihome.de/index.php/'#0#0#5'TEdit'
@@ -37,7 +37,7 @@ LazarusResources.Add('TfWikiHelp','FORMDATA',[
   +'mplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#16'Special:Allpage'
   +'s'#6#16'Spezial:Allpages'#0#9'MaxLength'#2#0#8'OnSelect'#7#16'cbLanguageSel'
   +'ect'#8'TabOrder'#2#6#0#0#9'TCheckBox'#16'cbAddLinkedPages'#4'Left'#2#8#6'He'
-  +'ight'#2#13#3'Top'#3#220#0#5'Width'#2'g'#7'Caption'#6#16'Add linked Pages'#8
+  +'ight'#2#15#3'Top'#3#220#0#5'Width'#2'i'#7'Caption'#6#16'Add linked Pages'#8
   +'TabOrder'#2#7#0#0#15'TXMLPropStorage'#10'Properties'#12'StoredValues'#14#1#4
   +'Name'#6#9'OUTPUTDIR'#0#1#4'Name'#6#8'WIKIPAGE'#0#1#4'Name'#6#10'PAGEOFFSET'
   +#0#0#4'left'#2#4#3'top'#2#4#0#0#0
diff --git a/applications/wikihelp/src/umain.pas b/applications/wikihelp/src/umain.pas
index b07d1d936..ce887e1d5 100644
--- a/applications/wikihelp/src/umain.pas
+++ b/applications/wikihelp/src/umain.pas
@@ -58,10 +58,12 @@ var
   http : THttpSend;
   ss : TStringStream;
   s : string;
+  tmp: String;
 begin
   lbFoundPages.Items.Clear;
   ss := TStringStream.Create('');
   http := THttpSend.Create;
+  http.UserAgent := 'Mozilla/4.0 (compatible; WikiHelp)';
   http.HTTPMethod('GET',eWikiPage.Text+SpecialPageURL);
   http.Document.SaveToStream(ss);
   http.Free;
@@ -77,8 +79,13 @@ begin
   while pos('<a href="',s) > 0 do
     begin
       s := copy(s,pos('<a href="',s)+10,length(s));
-      if copy(copy(s,0,pos('"',s)-1),0,length(ePageOffset.Text)) = ePageOffset.Text then
-        lbFoundPages.Items.Add(copy(s,0,pos('"',s)-1));
+      tmp := copy(s,0,pos('"',s)-1);
+      while pos(copy(tmp,0,pos('/',tmp)-1),eWikiPage.Text) > 0 do
+        tmp := copy(tmp,pos('/',tmp)+1,length(tmp));
+      if copy(tmp,0,length(ePageOffset.Text)) = ePageOffset.Text then
+        begin
+          lbFoundPages.Items.Add(tmp);
+        end;
       s := copy(s,pos('"',s)+1,length(s));
     end;
 end;
diff --git a/applications/wikihelp/src/wikihelp.lpi b/applications/wikihelp/src/wikihelp.lpi
index 5fbcab034..f315f5ff8 100644
--- a/applications/wikihelp/src/wikihelp.lpi
+++ b/applications/wikihelp/src/wikihelp.lpi
@@ -31,14 +31,16 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="25">
+    <Units Count="26">
       <Unit0>
         <Filename Value="wikihelp.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wikihelp"/>
-        <CursorPos X="49" Y="15"/>
+        <CursorPos X="1" Y="17"/>
         <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
         <UsageCount Value="46"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="umain.pas"/>
@@ -46,17 +48,17 @@
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="umain.lrs"/>
         <UnitName Value="uMain"/>
-        <CursorPos X="55" Y="529"/>
-        <TopLine Value="1"/>
+        <CursorPos X="55" Y="66"/>
+        <TopLine Value="40"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="46"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\..\LKomponenten\synapse\httpsend.pas"/>
+        <Filename Value="..\..\lkomponenten\synapse\httpsend.pas"/>
         <UnitName Value="httpsend"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="37"/>
+        <CursorPos X="47" Y="185"/>
+        <TopLine Value="166"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
@@ -143,9 +145,9 @@
       <Unit14>
         <Filename Value="uappconsts.pas"/>
         <UnitName Value="uAppconsts"/>
-        <CursorPos X="23" Y="9"/>
+        <CursorPos X="73" Y="8"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="13"/>
         <Loaded Value="True"/>
       </Unit14>
@@ -213,130 +215,85 @@
         <UsageCount Value="10"/>
       </Unit23>
       <Unit24>
-        <Filename Value="..\..\..\..\test.xml"/>
+        <Filename Value="..\..\test.xml"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="XML"/>
       </Unit24>
+      <Unit25>
+        <Filename Value="..\defs\nld.xml"/>
+        <CursorPos X="30" Y="3"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+        <SyntaxHighlighter Value="XML"/>
+      </Unit25>
     </Units>
-    <JumpHistory Count="29" HistoryIndex="28">
+    <JumpHistory Count="16" HistoryIndex="15">
       <Position1>
         <Filename Value="umain.pas"/>
-        <Caret Line="524" Column="24" TopLine="516"/>
+        <Caret Line="79" Column="1" TopLine="56"/>
       </Position1>
       <Position2>
         <Filename Value="umain.pas"/>
-        <Caret Line="509" Column="1" TopLine="503"/>
+        <Caret Line="61" Column="15" TopLine="60"/>
       </Position2>
       <Position3>
         <Filename Value="umain.pas"/>
-        <Caret Line="510" Column="1" TopLine="495"/>
+        <Caret Line="81" Column="7" TopLine="60"/>
       </Position3>
       <Position4>
-        <Filename Value="umain.pas"/>
-        <Caret Line="512" Column="1" TopLine="497"/>
+        <Filename Value="wikihelp.lpr"/>
+        <Caret Line="15" Column="49" TopLine="1"/>
       </Position4>
       <Position5>
-        <Filename Value="umain.pas"/>
-        <Caret Line="513" Column="1" TopLine="498"/>
+        <Filename Value="wikihelp.lpr"/>
+        <Caret Line="17" Column="1" TopLine="1"/>
       </Position5>
       <Position6>
         <Filename Value="umain.pas"/>
-        <Caret Line="514" Column="1" TopLine="499"/>
+        <Caret Line="80" Column="1" TopLine="60"/>
       </Position6>
       <Position7>
         <Filename Value="umain.pas"/>
-        <Caret Line="516" Column="1" TopLine="501"/>
+        <Caret Line="81" Column="1" TopLine="61"/>
       </Position7>
       <Position8>
         <Filename Value="umain.pas"/>
-        <Caret Line="145" Column="1" TopLine="136"/>
+        <Caret Line="82" Column="1" TopLine="62"/>
       </Position8>
       <Position9>
         <Filename Value="umain.pas"/>
-        <Caret Line="520" Column="20" TopLine="506"/>
+        <Caret Line="84" Column="1" TopLine="64"/>
       </Position9>
       <Position10>
         <Filename Value="umain.pas"/>
-        <Caret Line="522" Column="1" TopLine="507"/>
+        <Caret Line="86" Column="1" TopLine="66"/>
       </Position10>
       <Position11>
         <Filename Value="umain.pas"/>
-        <Caret Line="523" Column="1" TopLine="508"/>
+        <Caret Line="88" Column="1" TopLine="68"/>
       </Position11>
       <Position12>
         <Filename Value="umain.pas"/>
-        <Caret Line="525" Column="1" TopLine="510"/>
+        <Caret Line="80" Column="1" TopLine="60"/>
       </Position12>
       <Position13>
         <Filename Value="umain.pas"/>
-        <Caret Line="527" Column="1" TopLine="512"/>
+        <Caret Line="81" Column="1" TopLine="61"/>
       </Position13>
       <Position14>
         <Filename Value="umain.pas"/>
-        <Caret Line="531" Column="1" TopLine="516"/>
+        <Caret Line="82" Column="1" TopLine="62"/>
       </Position14>
       <Position15>
         <Filename Value="umain.pas"/>
-        <Caret Line="539" Column="1" TopLine="522"/>
+        <Caret Line="22" Column="41" TopLine="1"/>
       </Position15>
       <Position16>
         <Filename Value="umain.pas"/>
-        <Caret Line="540" Column="1" TopLine="522"/>
+        <Caret Line="66" Column="12" TopLine="40"/>
       </Position16>
-      <Position17>
-        <Filename Value="umain.pas"/>
-        <Caret Line="541" Column="1" TopLine="522"/>
-      </Position17>
-      <Position18>
-        <Filename Value="umain.pas"/>
-        <Caret Line="542" Column="1" TopLine="522"/>
-      </Position18>
-      <Position19>
-        <Filename Value="umain.pas"/>
-        <Caret Line="510" Column="1" TopLine="495"/>
-      </Position19>
-      <Position20>
-        <Filename Value="umain.pas"/>
-        <Caret Line="511" Column="1" TopLine="496"/>
-      </Position20>
-      <Position21>
-        <Filename Value="umain.pas"/>
-        <Caret Line="513" Column="1" TopLine="498"/>
-      </Position21>
-      <Position22>
-        <Filename Value="umain.pas"/>
-        <Caret Line="514" Column="1" TopLine="499"/>
-      </Position22>
-      <Position23>
-        <Filename Value="umain.pas"/>
-        <Caret Line="515" Column="1" TopLine="500"/>
-      </Position23>
-      <Position24>
-        <Filename Value="umain.pas"/>
-        <Caret Line="517" Column="1" TopLine="502"/>
-      </Position24>
-      <Position25>
-        <Filename Value="umain.pas"/>
-        <Caret Line="518" Column="1" TopLine="503"/>
-      </Position25>
-      <Position26>
-        <Filename Value="umain.pas"/>
-        <Caret Line="519" Column="1" TopLine="504"/>
-      </Position26>
-      <Position27>
-        <Filename Value="umain.pas"/>
-        <Caret Line="523" Column="10" TopLine="514"/>
-      </Position27>
-      <Position28>
-        <Filename Value="umain.pas"/>
-        <Caret Line="187" Column="1" TopLine="169"/>
-      </Position28>
-      <Position29>
-        <Filename Value="umain.pas"/>
-        <Caret Line="534" Column="41" TopLine="523"/>
-      </Position29>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>