diff --git a/tools/chmmaker/chmmaker.lpi b/tools/chmmaker/chmmaker.lpi
index 33993a6a6a..fc26925943 100644
--- a/tools/chmmaker/chmmaker.lpi
+++ b/tools/chmmaker/chmmaker.lpi
@@ -25,7 +25,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication Use="True" PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams=""/>
       </local>
     </RunParams>
     <RequiredPackages Count="3">
@@ -51,13 +51,14 @@
         <ComponentName Value="CHMForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="unit1"/>
       </Unit1>
       <Unit2>
         <Filename Value="chmsitemapeditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="SitemapEditForm"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="CHMSiteMapEditor"/>
       </Unit2>
     </Units>
   </ProjectOptions>
diff --git a/tools/chmmaker/chmmaker.lpr b/tools/chmmaker/chmmaker.lpr
index ce28b37740..b9c0d06aa0 100644
--- a/tools/chmmaker/chmmaker.lpr
+++ b/tools/chmmaker/chmmaker.lpr
@@ -3,9 +3,9 @@ program chmmaker;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  {$IFDEF UNIX}
   cthreads,
-  {$ENDIF}{$ENDIF}
+  {$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms, LazFileUtils
   { add your units here }, unit1, CHMSiteMapEditor, lhelpcontrolpkg;