diff --git a/components/lazcontrols/docs/make-docs.bat b/components/lazcontrols/docs/make-docs.bat
index f69d104f84..c83fe10304 100644
--- a/components/lazcontrols/docs/make-docs.bat
+++ b/components/lazcontrols/docs/make-docs.bat
@@ -10,15 +10,16 @@ REM =======================================================================
 REM ======================================
 REM SET THE CORRECT PATHS FOR YOUR SYSTEM
 REM ======================================
-
 REM lazarus documentation directory
 set docdir=..\..\..\docs
 REM fpdoc executable directory
-set fpcdir=..\..\..\..\lazarus-2.2.0-RC2\fpc\3.2.2\bin\x86_64-win64
+REM set fpcdir=..\..\..\..\lazarus-2.2.0-RC2\fpc\3.2.2\bin\x86_64-win64
+set fpcdir=..\..\..\..\fpc331\fpc\bin\x86_64-win64
 REM directory with lazarus git repository
 set gitdir=..\..\..\..\usr\work\git-lazarus
 
 REM values used in the footer
+REM package title for CHM
 set pkgtitle=Lazarus Controls Package (LazControls)
 
 REM CHANGE THIS BEFORE BUILDING
@@ -49,7 +50,6 @@ echo|(set /p="  <td class='footer-date'>Generated %dtstamp%</td>" & echo.) >> la
 echo|(set /p=" </tr>" & echo.) >> lazcontrols-footer.xml
 echo|(set /p="</table>" & echo.) >> lazcontrols-footer.xml
 
-echo.
 echo Generating CHM help...
 
 REM generate chm format
@@ -58,7 +58,6 @@ REM output to current directory
 
 %fpcdir%\fpdoc --project=lazcontrols-project.xml --format=chm --verbose --import="%docdir%\chm\rtl.xct,ms-its:rtl.chm::/" --import="%docdir%\chm\fcl.xct,ms-its:fcl.chm::/" --import="%docdir%\chm\lcl.xct,ms-its:lcl.chm::/" --import="%docdir%\chm\lazutils.xct,ms-its:lazutils.chm::/" > .\build_chm.log
 
-echo.
 echo Generating HTML help...
 
 REM generate html format
diff --git a/components/lazcontrols/docs/make-docs.sh b/components/lazcontrols/docs/make-docs.sh
index 086d7b4b07..46c76d01e9 100644
--- a/components/lazcontrols/docs/make-docs.sh
+++ b/components/lazcontrols/docs/make-docs.sh
@@ -12,11 +12,12 @@
 # lazarus documentation directory
 docdir="../../../docs"
 # fpdoc executable directory
-fpcdir="../../../../lazarus-2.2.0-RC2/fpc/3.2.2/bin/x86_64-win64"
+#fpcdir="../../../../lazarus-2.2.0-RC2/fpc/3.2.2/bin/x86_64-win64"
+fpcdir="../../../../fpc331/fpc/bin/x86_64-win64"
 # directory with lazarus git repository
 gitdir="../../../../usr/work/git-lazarus"
-
 # values used in the footer
+# package title for CHM
 pkgtitle="Lazarus Controls Package (LazControls)"
 # CHANGE THIS BEFORE BUILDING
 version="2.3.0"
@@ -40,32 +41,35 @@ cat << EOT > lazcontrols-footer.xml
 </table>
 EOT
 
-echo ""
-echo "Generating CHM help..."
-
 # generate chm format
 # imports done manually to set the correct prefix for the output format
 # output to current directory
+echo "Generating CHM help..."
 $fpcdir/fpdoc --project=lazcontrols-project.xml --format=chm --verbose --import="$docdir/chm/rtl.xct,ms-its:rtl.chm::/" --import="$docdir/chm/fcl.xct,ms-its:fcl.chm::/" --import="$docdir/chm/lcl.xct,ms-its:lcl.chm::/" --import="$docdir/chm/lazutils.xct,ms-its:lazutils.chm::/" 2>&1 | tee ./build_chm.log
 
-echo ""
-echo "Generating HTML help..."
-
 # generate html format
 # imports done manually to set the correct prefix for the output format
 # html written to lazcontrols sub-directory
+echo "Generating HTML help..."
 $fpcdir/fpdoc --project=lazcontrols-project.xml --format=html --verbose --import="$docdir/chm/rtl.xct,../rtl/" --import="$docdir/chm/fcl.xct,../fcl/" --import="$docdir/chm/lcl.xct,../lcl/" --import="$docdir/chm/lazutils.xct,../lazutils/" --output=lazcontrols  2>&1 | tee ./build_html.log
 
+# convert CRLF to LF so git doesn't complain
+#echo "Converting CRLF to LF in HTML files..."
+#cd lazcontrols
+#dos2unix *.{css,html}
+#dos2unix **/*.{css,html}
+#cd ..
+
 # create an archive file with html content
 #echo "Creating archive: docs-html-lazcontrols-$dtstamp.7z"
 #7z a -t7z -mx9 -r docs-html-lazcontrols-$dtstamp.7z ./lazcontrols/ > /dev/null
 
-# move generated html to lazarus docs/html directory
-#rm -vrf $docdir/html/lazcontrols/
-#mv -vrf ./lazcontrols $docdir/html/
+# copy or move generated html to lazarus docs/html directory
+#rm -vrf $docdir/html/lazcontrols/*
+#cp -vrf ./lazcontrols/* $docdir/html/lazcontrols/
 
-# move generated chm, xct to lazarus docs directory
-#mv -v lazcontrols.{chm,xct} $docdir/chm/
+# copy or move generated chm, xct to lazarus docs directory
+#cp -v lazcontrols.{chm,xct} $docdir/chm/
 
 # discard generated footer file
 rm lazcontrols-footer.xml