diff --git a/INSTALL.BAT b/INSTALL.BAT
index 4f14438..07819d6 100644
--- a/INSTALL.BAT
+++ b/INSTALL.BAT
@@ -17,7 +17,8 @@ echo.
 echo  You can change the destination by editing this file.
 echo.
 
-set TARGET=C:\CNOTES
+if "%CNOTES_HOME%"=="" set TARGET=C:\CNOTES
+if not "%CNOTES_HOME%"=="" set TARGET=%CNOTES_HOME%
 
 echo  Target directory: %TARGET%
 echo.
@@ -49,6 +50,7 @@ goto endauto
 
 :noautoexec
 echo Skipped AUTOEXEC.BAT modification.
+echo.
 echo  To use cnotes:
 echo    1. Add the directory to your PATH (recommended):
 echo.
@@ -61,8 +63,9 @@ echo       %TARGET%\cnadd "Your first note"
 echo.
 echo  Type CNHELP for command overview.
 echo.
-:endauto
+goto endauto
 
+:endauto
 echo.
 echo  Installation complete!
 echo.