diff --git a/common/config b/common/config
index 3d9e5a3..48a35df 100644
--- a/common/config
+++ b/common/config
@@ -36,10 +36,10 @@ RUNMAKE=0
 
 #--- Optimize the build  [0-2]
 #  0 = no optimization
-#  1 = optimize chapter06 only
-#  2 = optimize both chapter05 and chapter06
+#  1 = optimize final system only
+#  2 = optimize both temporary tools and final system
 #
-# Optimization values are set in opt_config and opt_override
+# Optimization values are set in optimize/* files
 OPTIMIZE=0
 
 #--- Run test suites  [0-3]
diff --git a/optimize/opt_config b/optimize/opt_config
index 622530b..56c3530 100644
--- a/optimize/opt_config
+++ b/optimize/opt_config
@@ -8,16 +8,16 @@
 #
 
 #--- Default optimization mode
-#    This level is overridden by definitions in common/opt_override;
+#    This level is overridden by definitions in opt_override;
 #    in this way, packages can be tuned independently.  For example,
 #    if you have trouble building a package in mode defOpt, add
-#    the package to common/opt_override with a different mode.
+#    the package to opt_override with a different mode.
 DEF_OPT_LVL=defOpt
 
 
 #--- Active optimization variables
 #    Variables listed here will be set as defined in the appropriate
-#    file in common/opt_config.d/; others will be ignored.
+#    file in opt_config.d/; others will be ignored.
 ACTIVE_OPT_VARS="CFLAGS CXXFLAGS LDFLAGS \
                  OTHER_CFLAGS OTHER_CXXFLAGS OTHER_LDFLAGS"
 
@@ -33,6 +33,6 @@ ACTIVE_OPT_VARS="CFLAGS CXXFLAGS LDFLAGS \
 #
 #    Add packages that are to use this mode to opt_override with:
 #      echo 'myPkg  newMode' >> opt_override
-for mode in $COMMON_DIR/opt_config.d/* ; do
+for mode in optimize/opt_config.d/* ; do
   source $mode
 done
diff --git a/optimize/opt_config.d/defOpt_fPIC b/optimize/opt_config.d/defOpt_fPIC
index 7dbe4ee..05f874e 100644
--- a/optimize/opt_config.d/defOpt_fPIC
+++ b/optimize/opt_config.d/defOpt_fPIC
@@ -12,7 +12,7 @@
 #####
 
 # Inherit optimizations from defOpt
-source $COMMON_DIR/opt_config.d/defOpt
+source optimize/opt_config.d/defOpt
 
 CFLAGS_defOpt_fPIC=$CFLAGS_defOpt" -fPIC"
 CXXFLAGS_defOpt_fPIC=$CFLAGS_defOpt" -fPIC"