diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 68d674e919..dcdd27dd14 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -5036,7 +5036,7 @@ PORTVERSION=	1.0</programlisting>
 	  example:</para>
 
 	<programlisting>post-install:
-	${STRIP_CMD} ${PREFIX}/bin/xdl</programlisting>
+	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting>
 
 	<para>Use the &man.file.1; command on the installed executable
 	  to check whether the binary is stripped or not.  If it does
@@ -5068,8 +5068,8 @@ PORTVERSION=	1.0</programlisting>
 	  target.</para>
 
 	<programlisting>post-install:
-	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples &amp;&amp; ${COPYTREE_SHARE} . ${EXAMPLESDIR})</programlisting>
+	  ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	  (cd ${WRKSRC}/examples &amp;&amp; ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})</programlisting>
 
 	<para>This example will install the contents of
 	  <filename>examples</filename> directory in the vendor
@@ -5077,8 +5077,8 @@ PORTVERSION=	1.0</programlisting>
 	  port.</para>
 
 	<programlisting>post-install:
-	${MKDIR} ${DATADIR}/summer
-	(cd ${WRKSRC}/temperatures &amp;&amp; ${COPYTREE_SHARE} "June July August" ${DATADIR}/summer)</programlisting>
+	  ${MKDIR} ${STAGEDIR}${DATADIR}/summer
+	  (cd ${WRKSRC}/temperatures &amp;&amp; ${COPYTREE_SHARE} "June July August" ${STAGEDIR}${DATADIR}/summer)</programlisting>
 
 	<para>And this example will install the data of summer months
 	  to the <filename>summer</filename> subdirectory of a
@@ -5091,9 +5091,9 @@ PORTVERSION=	1.0</programlisting>
 	  one can use the following command.</para>
 
 	<programlisting>post-install:
-	${MKDIR} ${EXAMPLESDIR}
+	  ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples &amp;&amp; \
-		${COPYTREE_SHARE} . ${EXAMPLESDIR} "! -name Makefile")</programlisting>
+	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")</programlisting>
 
 	<para>Note that these macros does not add the installed files
 	  to <filename>pkg-plist</filename>.  You still need to list
@@ -10008,7 +10008,7 @@ lib/X11/oneko/sounds/cat.au
 
       <programlisting>post-install:
 	@if [ ! -f ${PREFIX}/etc/orbit.conf ]; then \
-		${CP} -p ${PREFIX}/etc/orbit.conf.sample ${PREFIX}/etc/orbit.conf ; \
+	${CP} -p ${PREFIX}/etc/orbit.conf.sample ${STAGEDIR}${PREFIX}/etc/orbit.conf ; \
 	fi</programlisting>
 
       <para>For each configuration file, create the following three