diff --git a/tools/chmmaker/chmmaker.lpi b/tools/chmmaker/chmmaker.lpi
index fc26925943..07524ca50a 100644
--- a/tools/chmmaker/chmmaker.lpi
+++ b/tools/chmmaker/chmmaker.lpi
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InIDEConfig"/>
-      <MainUnit Value="0"/>
       <ResourceType Value="res"/>
     </General>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams=""/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams=""/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
diff --git a/tools/chmmaker/chmsitemapeditor.lfm b/tools/chmmaker/chmsitemapeditor.lfm
index 72f0d1c9a2..8b495f1e3c 100644
--- a/tools/chmmaker/chmsitemapeditor.lfm
+++ b/tools/chmmaker/chmsitemapeditor.lfm
@@ -8,30 +8,27 @@ object SitemapEditForm: TSitemapEditForm
   ClientHeight = 651
   ClientWidth = 773
   ShowInTaskBar = stAlways
-  LCLVersion = '0.9.27'
+  LCLVersion = '2.3.0.0'
   object Label3: TLabel
     Left = 424
-    Height = 18
+    Height = 15
     Top = 16
-    Width = 110
+    Width = 90
     Caption = 'Global Properties'
-    ParentColor = False
   end
   object Label4: TLabel
     Left = 444
-    Height = 18
+    Height = 15
     Top = 136
-    Width = 111
+    Width = 94
     Caption = 'Foreground Color'
-    ParentColor = False
   end
   object Label5: TLabel
     Left = 444
-    Height = 18
+    Height = 15
     Top = 176
-    Width = 114
+    Width = 96
     Caption = 'Background Color'
-    ParentColor = False
   end
   object ForegroundClrBtn: TColorButton
     Left = 600
@@ -41,7 +38,6 @@ object SitemapEditForm: TSitemapEditForm
     BorderWidth = 2
     ButtonColorSize = 16
     ButtonColor = clBlack
-    Color = clBtnFace
   end
   object BackgroundClrBtn: TColorButton
     Left = 600
@@ -51,7 +47,6 @@ object SitemapEditForm: TSitemapEditForm
     BorderWidth = 2
     ButtonColorSize = 16
     ButtonColor = clNone
-    Color = clBtnFace
   end
   object GroupBox1: TGroupBox
     Left = 0
@@ -60,25 +55,23 @@ object SitemapEditForm: TSitemapEditForm
     Width = 404
     Align = alLeft
     Caption = 'Sitemap Tree/List'
-    ClientHeight = 632
+    ClientHeight = 631
     ClientWidth = 400
     TabOrder = 0
     object Label1: TLabel
       Left = 11
-      Height = 18
+      Height = 15
       Top = 467
-      Width = 116
+      Width = 98
       Caption = 'Local link (in chm)'
       Enabled = False
-      ParentColor = False
     end
     object Label2: TLabel
       Left = 11
-      Height = 18
+      Height = 15
       Top = 575
-      Width = 59
+      Width = 49
       Caption = 'Add Item'
-      ParentColor = False
     end
     object SitemapTree: TTreeView
       Left = 0
@@ -86,7 +79,6 @@ object SitemapEditForm: TSitemapEditForm
       Top = 0
       Width = 400
       Align = alTop
-      DefaultItemHeight = 19
       ReadOnly = True
       TabOrder = 0
       OnCustomCreateItem = SitemapTreeCustomCreateItem
@@ -95,17 +87,12 @@ object SitemapEditForm: TSitemapEditForm
     end
     object DescriptionEdit: TLabeledEdit
       Left = 11
-      Height = 25
+      Height = 23
       Top = 435
       Width = 292
-      EditLabel.AnchorSideLeft.Control = DescriptionEdit
-      EditLabel.AnchorSideBottom.Control = DescriptionEdit
-      EditLabel.Left = 11
-      EditLabel.Height = 18
-      EditLabel.Top = 414
-      EditLabel.Width = 73
+      EditLabel.Height = 15
+      EditLabel.Width = 292
       EditLabel.Caption = 'Description'
-      EditLabel.ParentColor = False
       Enabled = False
       TabOrder = 1
       OnChange = DescriptionEditChange
@@ -122,30 +109,23 @@ object SitemapEditForm: TSitemapEditForm
     end
     object LocalCombo: TComboBox
       Left = 11
-      Height = 29
+      Height = 23
       Top = 487
       Width = 375
-      AutoComplete = False
       Enabled = False
-      ItemHeight = 0
-      ItemWidth = 0
+      ItemHeight = 15
       OnChange = LocalComboChange
       OnKeyUp = LocalComboKeyUp
       TabOrder = 3
     end
     object URLEdit: TLabeledEdit
       Left = 11
-      Height = 25
+      Height = 23
       Top = 539
       Width = 375
-      EditLabel.AnchorSideLeft.Control = URLEdit
-      EditLabel.AnchorSideBottom.Control = URLEdit
-      EditLabel.Left = 11
-      EditLabel.Height = 18
-      EditLabel.Top = 518
-      EditLabel.Width = 66
+      EditLabel.Height = 15
+      EditLabel.Width = 375
       EditLabel.Caption = 'URL (http)'
-      EditLabel.ParentColor = False
       Enabled = False
       TabOrder = 4
       OnChange = URLEditChange
@@ -195,24 +175,19 @@ object SitemapEditForm: TSitemapEditForm
   end
   object FontEdit: TLabeledEdit
     Left = 444
-    Height = 25
+    Height = 23
     Top = 72
     Width = 232
-    EditLabel.AnchorSideLeft.Control = FontEdit
-    EditLabel.AnchorSideBottom.Control = FontEdit
-    EditLabel.Left = 444
-    EditLabel.Height = 18
-    EditLabel.Top = 51
-    EditLabel.Width = 29
+    EditLabel.Height = 15
+    EditLabel.Width = 232
     EditLabel.Caption = 'Font'
-    EditLabel.ParentColor = False
     TabOrder = 1
   end
   object FolderViewCheck: TCheckBox
     Left = 444
-    Height = 22
+    Height = 19
     Top = 212
-    Width = 129
+    Width = 104
     Caption = 'Use Folder Icons'
     TabOrder = 2
   end
diff --git a/tools/chmmaker/chmsitemapeditor.pas b/tools/chmmaker/chmsitemapeditor.pas
index 08bc083cb4..a7258da819 100644
--- a/tools/chmmaker/chmsitemapeditor.pas
+++ b/tools/chmmaker/chmsitemapeditor.pas
@@ -146,8 +146,8 @@ procedure TSitemapEditForm.SaveBtnClick(Sender: TObject);
   begin
     ChmItem := ChmItems.NewItem;
     ChmItem.Text := TreeNode.Text;
-    ChmItem.URL := TreeNode.URL;
-    ChmItem.Local := TreeNode.Local;
+    ChmItem.AddURL(TreeNode.URL);
+    ChmItem.AddLocal(TreeNode.Local);
     for I := 0 to TreeNode.Count-1 do begin
       AddItem(TChmTreeNode(TreeNode.Items[I]), ChmItem.Children);
     end;
@@ -266,7 +266,7 @@ procedure TSitemapEditForm.LoadFromStream(AStream: TStream);
        ChmItem := Items.Item[I];
        TreeNode := TChmTreeNode(SitemapTree.Items.AddChild(ParentItem, ChmItem.Text));
        TreeNode.Local := ChmItem.Local;
-       TreeNode.URL := ChmItem.URL;
+       TreeNode.URL := ChmItem.SubItem[0].URL;
        AddItems(ChmItem.Children, TreeNode);
      end;
    end;
diff --git a/tools/chmmaker/example/example.hfp b/tools/chmmaker/example/example.hfp
index fb2c1f1cea..8b596d085a 100644
--- a/tools/chmmaker/example/example.hfp
+++ b/tools/chmmaker/example/example.hfp
@@ -28,5 +28,6 @@
     <DefaultFont Value=""/>
     <DefaultWindow Value=""/>
     <ScanHtmlContents Value="False"/>
+    <LocaleID Value="1033"/>
   </Settings>
 </CONFIG>