diff --git a/sbin/scan_ffs/Makefile b/sbin/scan_ffs/Makefile
index 33e93e051dba..45aa847d1d54 100644
--- a/sbin/scan_ffs/Makefile
+++ b/sbin/scan_ffs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/07/31 19:26:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2005/09/10 23:08:37 wiz Exp $
 
 PROG=	scan_ffs
-MAN=	scan_ffs.8 scan_lfs.8
 
 LINKS=	${BINDIR}/scan_ffs ${BINDIR}/scan_lfs
+MLINKS=	scan_ffs.8 scan_lfs.8
 
 LDADD=	-lutil
 DPADD=	${LIBUTIL}
diff --git a/sbin/scan_ffs/scan_ffs.8 b/sbin/scan_ffs/scan_ffs.8
index 1c0ddf2f28b7..87972a75f9c8 100644
--- a/sbin/scan_ffs/scan_ffs.8
+++ b/sbin/scan_ffs/scan_ffs.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: scan_ffs.8,v 1.5 2005/09/09 20:21:39 wiz Exp $
+.\"	$NetBSD: scan_ffs.8,v 1.6 2005/09/10 23:08:37 wiz Exp $
 .\"     OpenBSD: scan_ffs.8,v 1.13 2004/12/14 00:04:21 jmc Exp
 .\"
 .\" Copyright (c) 2005 Juan Romero Pardines
@@ -25,12 +25,13 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 15, 2005
+.Dd September 10, 2005
 .Dt SCAN_FFS 8
 .Os
 .Sh NAME
-.Nm scan_ffs
-.Nd find FFSv1/FFSv2 partitions on a disk
+.Nm scan_ffs ,
+.Nm scan_lfs
+.Nd find FFSv1/FFSv2/LFS partitions on a disk
 .Sh SYNOPSIS
 .Nm
 .Op Fl lv
@@ -39,10 +40,11 @@
 .Ar device
 .Sh DESCRIPTION
 .Nm
-will take a raw disk device that covers the whole disk
-and will find all possible FFSv1/FFSv2 partitions, independent of block
-sizes, on the disk.
-It will show the file system type (FFSv1 or FFSv2), size, and offset.
+will take a raw disk device that covers the whole disk and will find
+all possible FFSv[12]/LFS partitions, independent of block sizes, on
+the disk.
+It will show the file system type (FFSv1, FFSv2, or LFS), size, and
+offset.
 Also it has an option to show the values with a disklabel-alike
 output.
 .Pp
@@ -79,6 +81,10 @@ The
 argument specifies which device
 .Nm
 should scan for file systems.
+.Pp
+.Nm scan_lfs
+is just another name for the same program, both behave in exactly
+the same way.
 .Sh SEE ALSO
 .Xr disklabel 8
 .Sh HISTORY
@@ -100,7 +106,8 @@ and
 It was ported to
 .Nx
 by
-.An Juan Romero Pardines .
+.An Juan Romero Pardines ,
+who also added LFS and FFSv2 support.
 .Sh BUGS
 Currently
 .Nm
diff --git a/sbin/scan_ffs/scan_lfs.8 b/sbin/scan_ffs/scan_lfs.8
deleted file mode 100644
index d783bab49296..000000000000
--- a/sbin/scan_ffs/scan_lfs.8
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"	$NetBSD: scan_lfs.8,v 1.2 2005/07/31 19:40:50 xtraeme Exp $
-.\"     OpenBSD: scan_ffs.8,v 1.13 2004/12/14 00:04:21 jmc Exp
-.\"
-.\" Copyright (c) 2005 Juan Romero Pardines
-.\" Copyright (c) 1997 Niklas Hallqvist, Tobias Weingartner
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 15, 2005
-.Dt SCAN_LFS 8
-.Os
-.Sh NAME
-.Nm scan_lfs
-.Nd finding LFS partitions on a disk
-.Sh SYNOPSIS
-.Nm
-.Op Fl lv
-.Op Fl e Ar end
-.Op Fl s Ar start
-.Ar device
-.Sh DESCRIPTION
-This program will take a raw disk device that covers the whole disk,
-and will find all possible FFS/LFS partitions with different block
-sizes on the disk.
-It will show the file system type (FFSv[12] or LFS), size and offset.
-Also it has an option to show the values with a disklabel-alike
-output.
-.Pp
-The options are as follows:
-.Bl -tag -width XXsXstartXX
-.It Fl e Ar end
-Where to stop searching for file systems.
-The
-.Ar end
-argument specifies the last sector that will be searched.
-Default is the last sector of
-.Ar device .
-.It Fl l
-Print out a string looking much like the input to disklabel.
-With a little massaging, this output can usually be used by
-.Xr disklabel 8 .
-.It Fl s Ar start
-Where to start searching for file systems.
-This makes it easier to skip swap
-partitions, or other large non-UFS/FFS partitions.
-The
-.Ar start
-argument specifies the first sector that will be searched.
-Default is the first sector of
-.Ar device .
-.It Fl v
-Be verbose about what
-.Nm
-is doing, and what has been found.
-.El
-.Pp
-The
-.Ar device
-argument specifies which device
-.Nm
-should scan for file systems.
-.Sh SEE ALSO
-.Xr disklabel 8
-.Sh HISTORY
-The
-.Nm
-program first appeared in
-.Nx 4.0 .
-.Sh AUTHORS
-.An -nosplit
-.Nm
-was written by
-.An Juan Romero Pardines
-for
-.Nx ,
-based on code of the
-.Xr scan_ffs 8
-program written by
-.An Niklas Hallqvist
-and
-.An Tobias Weingartner 
-for
-.Ox .