diff --git a/Scripts/scripts/cgal_create_cmake_script_with_options b/Scripts/scripts/cgal_create_cmake_script_with_options
index b1af3c88777..27667ad5c33 100755
--- a/Scripts/scripts/cgal_create_cmake_script_with_options
+++ b/Scripts/scripts/cgal_create_cmake_script_with_options
@@ -28,9 +28,6 @@
 
 create_cmake_script_with_options()
 {
-  # TODO add Qt4
-  # TODO prefer existing "local" options file over global options in $HOME
-
   qt3='n'
   qt4='n'
 
@@ -550,7 +547,7 @@ echo
 
 usage()
 {
-  echo "Usage: `basename $0` [-s source] [-c cgal-component1:cgal-component2:...] [-b boost-component1:boost-component2:...] [-p /path/to/package1:/path/to/package2:...] [-d /path/to/directory1:/path/to/directory2:...] [-o options_file='`pwd`/.cgal_cmake_options:$HOME/.cgal_cmake_options'] [-v] [-h]" >&2
+  echo "Usage: `basename $0` [-s source] [-c cgal-component1:cgal-component2:...] [-b boost-component1:boost-component2:...] [-p /path/to/package1:/path/to/package2:...] [-d /path/to/directory1:/path/to/directory2:...] [-o options_file='`pwd`/cgal_cmake_options:$HOME/.cgal_cmake_options_rc'] [-v] [-h]" >&2
   echo >&2
   echo "  -s source If this parameter is given the script will create one single executable for 'source' with all source files; otherwise it creates one executable for each main'ed source." >&2
   echo "  cgal_componentX - must be a valid cgal component, examples are 'Core','imageIO','PDB','Qt3','Qt4' ('benchmark')." >&2
@@ -577,7 +574,11 @@ PACKAGES=""
 DIRECTORIES_GIVEN=""
 DIRECTORIES=""
 
-OPTIONS_FILE="${HOME}/.cgal_cmake_options"
+OPTIONS_FILE=`pwd`"/cgal_cmake_options"
+
+if [ ! -e "$OPTIONS_FILE" ]; then
+  OPTIONS_FILE="${HOME}/.cgal_cmake_options_rc"
+fi
 
 # parse command line arguments
 while getopts s:c:b:p:d:o:hv OPT; do