diff --git a/handbook/porting.sgml b/handbook/porting.sgml
index aaf5855df7..85ce11c136 100644
--- a/handbook/porting.sgml
+++ b/handbook/porting.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: porting.sgml,v 1.84 1997-11-20 05:45:56 asami Exp $ -->
+<!-- $Id: porting.sgml,v 1.85 1997-12-27 10:57:51 asami Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect1><heading>Porting an existing piece of free software<label id="porting"></heading>
@@ -131,27 +131,28 @@ well commented, and you will still gain much knowledge from it.
 </verb></tscreen>
 <tt>__FreeBSD_version</tt> values:
 <tscreen><verb>
-2.0-RELEASE:                    199411
-2.1-current's:                  199501, 199503
-2.0.5-RELEASE:                  199504
-2.2-current before 2.1:         199508
-2.1.0-RELEASE:                  199511
-2.2-current before 2.1.5:       199512
-2.1.5-RELEASE:                  199607
-2.2-current before 2.1.6:       199608
-2.1.6-RELEASE:                  199612
-2.1.7-RELEASE:                  199612
-2.2-RELEASE:                    220000
-2.2.1-RELEASE:                  220000 (yes, no change)
-2.2-STABLE after 2.2.1-RELEASE: 220000 (yes, still no change)
-2.2-STABLE after texinfo-3.9:   221001
-2.2-STABLE after top:           221002
-2.2.2-RELEASE:                  222000
-2.2-STABLE after 2.2.2-RELEASE: 222001
-2.2.5-RELEASE:                  225000
-2.2-STABLE after 2.2.5-RELEASE:	225001
+2.0-RELEASE:                    	199411
+2.1-current's:                  	199501, 199503
+2.0.5-RELEASE:                  	199504
+2.2-current before 2.1:         	199508
+2.1.0-RELEASE:                  	199511
+2.2-current before 2.1.5:       	199512
+2.1.5-RELEASE:                  	199607
+2.2-current before 2.1.6:       	199608
+2.1.6-RELEASE:                  	199612
+2.1.7-RELEASE:                  	199612
+2.2-RELEASE:                    	220000
+2.2.1-RELEASE:                  	220000 (yes, no change)
+2.2-STABLE after 2.2.1-RELEASE: 	220000 (yes, still no change)
+2.2-STABLE after texinfo-3.9:   	221001
+2.2-STABLE after top:           	221002
+2.2.2-RELEASE:                  	222000
+2.2-STABLE after 2.2.2-RELEASE: 	222001
+2.2.5-RELEASE:                  	225000
+2.2-STABLE after 2.2.5-RELEASE:		225001
+2.2-STABLE after ldconfig -R merge:	225002
 3.0-current before mount(2) change:	300000
-3.0-current as of Nov 1997:     300001
+3.0-current as of Nov 1997:     	300001
 </verb></tscreen>
 	  (Note that 2.2-STABLE sometimes identifies itself as
 	  "2.2.5-STABLE" after the 2.2.5-RELEASE.)
@@ -298,11 +299,11 @@ lib/X11/oneko/mouse.xpm
 	<p>You should make sure that the port rules do exactly what
 	  you want it to do, including packaging up the port.  Try
 	  doing `<tt>make install</tt>', `<tt>make package</tt>' and
-	  then `<tt>pkg_delete &lt;pkgname&gt;</tt>' and see if all
+	  then `<tt>pkg_delete `make package-name`</tt>' and see if all
 	  the files and directories are correctly deleted.  Then do a
-	  `<tt>pkg_add &lt;pkgname&gt;.tgz</tt>' and see if everything
+	  `<tt>pkg_add `make package-name`.tgz</tt>' and see if everything
 	  re-appears and works correctly.  Then do another
-	  `<tt>pkg_delete &lt;pkgname&gt;</tt>' and then `<tt>make
+	  `<tt>pkg_delete `make package-name`</tt>' and then `<tt>make
 	  reinstall; make package</tt>' to make sure you haven't
 	  included in the packing list any files that are not
 	  installed by your port.