diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh
index d56d237706..b2e327424c 100755
--- a/tools/install/create_lazarus_deb.sh
+++ b/tools/install/create_lazarus_deb.sh
@@ -8,7 +8,7 @@
 #     gtk1              compile IDE and programs for gtk1.
 #     qt                compile IDE and programs for qt.
 #     append-revision   append the svn revision to the .deb version
-#     chmhelp           add package chmhelp and add chm,kwd,xct,txt files in docs/chm
+#     chmhelp           add package chmhelp and add chm,kwd files in docs/chm
 
 set -e
 
@@ -131,7 +131,7 @@ if [ "$UseCHMHelp" = "1" ]; then
   echo
   echo "Copying chm files"
   cd $LazSrcDir/docs/chm
-  cp -v *.txt *.kwd *.chm *.xct $LazDestDir/docs/chm/
+  cp -v *.kwd *.chm $LazDestDir/docs/chm/
   cd -
 fi
 
diff --git a/tools/install/macosx/create_lazarus_dmg.sh b/tools/install/macosx/create_lazarus_dmg.sh
index 89754ce25a..46ca27badb 100755
--- a/tools/install/macosx/create_lazarus_dmg.sh
+++ b/tools/install/macosx/create_lazarus_dmg.sh
@@ -3,13 +3,15 @@
 # This script requires an installed 'Iceberg'
 #
 # Usage:
-#
-#  Build a lazarus dmg:
-#   ./create_lazarus_dmg.sh
+#   ./create_lazarus_dmg.sh [chmhelp] [edit]
 #
 # This will setup a lazarus package in ~/tmp/buildlaz
 # run 'freeze' of Iceberg and create the dmg.
 #
+# Options:
+#   chmhelp          add package chmhelp and add chm,kwd files in docs/chm
+#   append-revision  append svn revision to dmg
+#
 # To edit the Iceberg configuration 'lazarus.packproj', run
 #   ./create_lazarus_dmg.sh edit
 # This will create ~/tmp/buildlaz/lazarus.packproj. Open the file with Iceberg.
@@ -28,19 +30,37 @@ set -x
 HDIUTIL=/usr/bin/hdiutil
 
 LazVersionPostfix=
-if [ "$1" = "append-revision" ]; then
-  LazVersionPostfix=$(../get_svn_revision_number.sh .)
-  if [ -n "$LazVersionPostfix" ]; then
-    LazVersionPostfix=.$LazVersionPostfix
-  fi
-  shift
-fi
-
+UseCHMHelp=
 EditMode=
-if [ "$1" = "edit" ]; then
-  EditMode=$1
+
+while [ $# -gt 0 ]; do
+  echo "param=$1"
+  case "$1" in
+  chmhelp)
+    echo "using package chmhelp"
+    UseCHMHelp=1
+    ;;
+
+  append-revision)
+    LazRevision=$(../get_svn_revision_number.sh .)
+    if [ -n "$LazRevision" ]; then
+      LazVersionPostfix=$LazVersionPostfix.$LazRevision
+    fi
+    echo "Appending svn revision $LazVersionPostfix to dmg name"
+    ;;
+
+  edit)
+    EditMode=1
+    ;;
+
+  *)
+    echo "invalid parameter $1"
+    echo "Usage: ./create_lazarus_dmg.sh [chmhelp] [append-revision] [edit]"
+    exit 1
+    ;;
+  esac
   shift
-fi
+done
 
 PPCARCH=ppcppc
 ARCH=$(uname -p)
@@ -102,6 +122,14 @@ rm -rf $BUILDDIR
 mkdir -p $ROOTDIR/Developer
 $SVN export $LAZSOURCEDIR $LAZBUILDDIR
 
+if [ "$UseCHMHelp" = "1" ]; then
+  echo
+  echo "Copying chm files"
+  cd $LAZSOURCEDIR/docs/chm
+  cp -v *.kwd *.chm $LAZBUILDDIR/docs/chm/
+  cd -
+fi
+
 #cp $LAZSOURCEDIR/lazarus $LAZBUILDDIR/
 #cp -R $LAZSOURCEDIR/lazarus.app $LAZBUILDDIR/
 #mkdir -p $LAZBUILDDIR/tools/install/