diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 7903b5a84..1fb529177 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -80,7 +80,7 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
   all the directories under <filename class="directory">$LFS</filename> by making
   <systemitem class="username">lfs</systemitem> the owner:</para>
 
-<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,opt,bin,sbin,tools}
 case $(uname -m) in
   x86_64) chown -v lfs $LFS/lib64 ;;
 esac</userinput></screen>
diff --git a/chapter04/creatingminlayout.xml b/chapter04/creatingminlayout.xml
index 6b339344b..a0f7a8d96 100644
--- a/chapter04/creatingminlayout.xml
+++ b/chapter04/creatingminlayout.xml
@@ -21,7 +21,7 @@
   <para>Create the required directory layout by issuing the following commands as
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin}
+<screen><userinput>mkdir -pv $LFS/{etc,opt,var} $LFS/usr/{bin,lib,sbin}
 
 for i in bin lib sbin; do
   ln -sv usr/$i $LFS/$i
diff --git a/chapter07/changingowner.xml b/chapter07/changingowner.xml
index b412bb278..b7f0b4a5b 100644
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@ -33,7 +33,7 @@
   user <systemitem class="username">root</systemitem> by running the following
   command:</para>
 
-<screen><userinput>chown -R root:root $LFS/{usr,lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown -R root:root $LFS/{usr,lib,var,etc,opt,bin,sbin,tools}
 case $(uname -m) in
   x86_64) chown -R root:root $LFS/lib64 ;;
 esac</userinput></screen>
diff --git a/chapter07/creatingdirs.xml b/chapter07/creatingdirs.xml
index 35a0a9003..afac89537 100644
--- a/chapter07/creatingdirs.xml
+++ b/chapter07/creatingdirs.xml
@@ -19,7 +19,7 @@
   <para>Create some root-level directories that are not in the limited set
     required in the previous chapters by issuing the following command:</para>
 
-<screen><userinput>mkdir -pv /{boot,home,mnt,opt,srv}</userinput></screen>
+<screen><userinput>mkdir -pv /{boot,home,mnt,srv}</userinput></screen>
 
   <para>Create the required set of subdirectories below the root-level by
     issuing the following commands:</para>