diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.8 b/gnu/usr.bin/ld/ldconfig/ldconfig.8
index e363269baab4..f91c50f2b270 100644
--- a/gnu/usr.bin/ld/ldconfig/ldconfig.8
+++ b/gnu/usr.bin/ld/ldconfig/ldconfig.8
@@ -20,7 +20,7 @@ directories.  It scans a set of built-in system directories and any
 specified on the command line (in the given order) looking for shared
 libraries and stores the results in the file
 .Xr /var/run/ld.so.hints
-to forstall the overhead that would otherwise result from the
+to forestall the overhead that would otherwise result from the
 directory search operations
 .Xr ld.so
 would have to perform to load the required shared libraries.
@@ -56,12 +56,8 @@ Lists the current contents of
 .Xr ld.so.hints
 on the standard output. The hints file will not be modified.
 .It Fl s
-Do not scan
-.Nm ldconfig
-'s builtin system directories
-.Sq /usr/lib
-and
-.Sq /usr/local/lib
+Do not scan the built-in system directory
+.Pq Dq /usr/lib
 for shared libraries.
 .It Fl v
 Switch on verbose mode.
diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.c b/gnu/usr.bin/ld/ldconfig/ldconfig.c
index 720527c43396..a62d4bc57638 100644
--- a/gnu/usr.bin/ld/ldconfig/ldconfig.c
+++ b/gnu/usr.bin/ld/ldconfig/ldconfig.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ldconfig.c,v 1.7 1994/06/10 15:16:54 pk Exp $
+ *	$Id: ldconfig.c,v 1.8 1994/06/16 13:38:32 pk Exp $
  */
 
 #include <sys/param.h>
@@ -54,7 +54,8 @@
 #undef major
 #undef minor
 
-char				*progname;
+extern char			*__progname;
+
 static int			verbose;
 static int			nostd;
 static int			justread;
@@ -84,12 +85,6 @@ char	*argv[];
 {
 	int		i, c;
 	int		rval = 0;
-	extern int	optind;
-
-	if ((progname = strrchr(argv[0], '/')) == NULL)
-		progname = argv[0];
-	else
-		progname++;
 
 	while ((c = getopt(argc, argv, "rsv")) != EOF) {
 		switch (c) {
@@ -103,7 +98,8 @@ char	*argv[];
 			justread = 1;
 			break;
 		default:
-			fprintf(stderr, "Usage: %s [-v] [dir ...]\n", progname);
+			fprintf(stderr, "Usage: %s [-r][-s][-v][dir ...]\n",
+				__progname);
 			exit(1);
 			break;
 		}
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index e363269baab4..f91c50f2b270 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -20,7 +20,7 @@ directories.  It scans a set of built-in system directories and any
 specified on the command line (in the given order) looking for shared
 libraries and stores the results in the file
 .Xr /var/run/ld.so.hints
-to forstall the overhead that would otherwise result from the
+to forestall the overhead that would otherwise result from the
 directory search operations
 .Xr ld.so
 would have to perform to load the required shared libraries.
@@ -56,12 +56,8 @@ Lists the current contents of
 .Xr ld.so.hints
 on the standard output. The hints file will not be modified.
 .It Fl s
-Do not scan
-.Nm ldconfig
-'s builtin system directories
-.Sq /usr/lib
-and
-.Sq /usr/local/lib
+Do not scan the built-in system directory
+.Pq Dq /usr/lib
 for shared libraries.
 .It Fl v
 Switch on verbose mode.
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 720527c43396..a62d4bc57638 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ldconfig.c,v 1.7 1994/06/10 15:16:54 pk Exp $
+ *	$Id: ldconfig.c,v 1.8 1994/06/16 13:38:32 pk Exp $
  */
 
 #include <sys/param.h>
@@ -54,7 +54,8 @@
 #undef major
 #undef minor
 
-char				*progname;
+extern char			*__progname;
+
 static int			verbose;
 static int			nostd;
 static int			justread;
@@ -84,12 +85,6 @@ char	*argv[];
 {
 	int		i, c;
 	int		rval = 0;
-	extern int	optind;
-
-	if ((progname = strrchr(argv[0], '/')) == NULL)
-		progname = argv[0];
-	else
-		progname++;
 
 	while ((c = getopt(argc, argv, "rsv")) != EOF) {
 		switch (c) {
@@ -103,7 +98,8 @@ char	*argv[];
 			justread = 1;
 			break;
 		default:
-			fprintf(stderr, "Usage: %s [-v] [dir ...]\n", progname);
+			fprintf(stderr, "Usage: %s [-r][-s][-v][dir ...]\n",
+				__progname);
 			exit(1);
 			break;
 		}