Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -5838,12 +5838,17 @@
 	<tbody>
 	  <row>
 	    <entry><command>bash</command></entry>
-	    <entry><filename>${PREFIX}/etc/bash_completion.d</filename></entry>
+	    <entry><filename>${PREFIX}/share/bash-completion/completions</filename></entry>
+	  </row>
+
+	  <row>
+	    <entry><command>fish</command></entry>
+	    <entry><filename>${PREFIX}/share/fish/completions/${PORTNAME}.fish</filename></entry>
 	  </row>
 
 	  <row>
 	    <entry><command>zsh</command></entry>
-	    <entry><filename>${PREFIX}/share/zsh/site-functions</filename></entry>
+	    <entry><filename>${PREFIX}/share/zsh/site-functions/_${PORTNAME}</filename></entry>
 	  </row>
 	</tbody>
       </tgroup>