diff --git a/cf/install-catman.sh b/cf/install-catman.sh
index 1632e989f..d41c8c42a 100755
--- a/cf/install-catman.sh
+++ b/cf/install-catman.sh
@@ -7,14 +7,16 @@
 INSTALL_DATA="$1"; shift
 mkinstalldirs="$1"; shift
 srcdir="$1"; shift
-mandir="$1"; shift
+manbase="$1"; shift
 suffix="$1"; shift
 
 for f in "$@"; do
 	base=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\1/'`
 	section=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\2/'`
-	catdir="$mandir/cat$section"
+	mandir="$manbase/man$section"
+	catdir="$manbase/cat$section"
 	c="$base.cat$section"
+
 	if test -f "$srcdir/$c"; then
 		if test \! -d "$catdir"; then
 			eval "$mkinstalldirs $catdir"
@@ -22,4 +24,30 @@ for f in "$@"; do
 		eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
 		eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix"
 	fi
+	for link in `sed -n -e '/SYNOPSIS/q;s/^\.Nm \([^ ]*\).*/\1/p' $srcdir/$f`; do
+		if [ "$link" != "$base" ]; then
+			target="$mandir/$link.$section"
+			for cmd in "ln -f $mandir/$base.$section $target" \
+				   "ln -s $base.$section $target" \
+				   "cp -f $mandir/$base.$section $target"
+			do
+				if eval "$cmd"; then
+					eval echo "$cmd"
+					break
+				fi
+			done
+			if test -f "$srcdir/$c"; then
+				target="$catdir/$link.$suffix"
+				for cmd in "ln -f $catdir/$base.$suffix $target" \
+					   "ln -fs $base.$suffix $target" \
+					   "cp -f $catdir/$base.$suffix $target"
+				do
+					if eval "$cmd"; then
+						eval echo "$cmd"
+						break
+					fi
+				done
+			fi
+		fi
+	done
 done