diff -ru sbin/dump.orig/dumprmt.c sbin/dump/dumprmt.c
--- sbin/dump.orig/dumprmt.c	2003-11-01 15:15:58.000000000 -0200
+++ sbin/dump/dumprmt.c	2004-09-23 20:40:00.000000000 -0300
@@ -96,7 +96,7 @@
 
 	rmtpeer = malloc(strlen(host) + 1);
 	if (rmtpeer)
-		strcpy(rmtpeer, host);
+		strlcpy(rmtpeer, host, strlen(host) + 1);
 	else
 		rmtpeer = host;
 	signal(SIGPIPE, rmtconnaborted);
diff -ru sbin/dump.orig/itime.c sbin/dump/itime.c
--- sbin/dump.orig/itime.c	2003-11-01 15:15:58.000000000 -0200
+++ sbin/dump/itime.c	2004-09-23 20:40:00.000000000 -0300
@@ -204,7 +204,7 @@
 		(struct dumpdates *)calloc(1, sizeof (struct dumpdates));
 	nddates += 1;
   found:
-	(void) strncpy(dtwalk->dd_name, fname, sizeof (dtwalk->dd_name));
+	strlcpy(dtwalk->dd_name, fname, sizeof(dtwalk->dd_name));
 	dtwalk->dd_level = level;
 	dtwalk->dd_ddate = spcl.c_date;
 
diff -ru sbin/dump.orig/main.c sbin/dump/main.c
--- sbin/dump.orig/main.c	2004-08-30 16:27:21.000000000 -0300
+++ sbin/dump/main.c	2004-09-23 20:44:26.000000000 -0300
@@ -297,16 +297,16 @@
 	dt = fstabsearch(disk);
 	if (dt != NULL) {
 		disk = rawname(dt->fs_spec);
-		(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
-		(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
+		strlcpy(spcl.c_dev, dt->fs_spec, NAMELEN);
+		strlcpy(spcl.c_filesys, dt->fs_file, NAMELEN);
 	} else {
-		(void)strncpy(spcl.c_dev, disk, NAMELEN);
-		(void)strncpy(spcl.c_filesys, "an unlisted file system",
+		strlcpy(spcl.c_dev, disk, NAMELEN);
+		strlcpy(spcl.c_filesys, "an unlisted file system",
 		    NAMELEN);
 	}
 	spcl.c_dev[NAMELEN-1]='\0';
 	spcl.c_filesys[NAMELEN-1]='\0';
-	(void)strcpy(spcl.c_label, "none");
+	strlcpy(spcl.c_label, "none", LBLSIZE);
 	(void)gethostname(spcl.c_host, NAMELEN);
 	spcl.c_level = level - '0';
 	spcl.c_type = TS_TAPE;
@@ -581,11 +581,8 @@
 	if (dp == NULL)
 		return (NULL);
 	*dp = '\0';
-	(void)strncpy(rawbuf, cp, MAXPATHLEN - 1);
-	rawbuf[MAXPATHLEN-1] = '\0';
+	snprintf(rawbuf, MAXPATHLEN, "%s/r%s", cp, dp + 1);
 	*dp = '/';
-	(void)strncat(rawbuf, "/r", MAXPATHLEN - 1 - strlen(rawbuf));
-	(void)strncat(rawbuf, dp + 1, MAXPATHLEN - 1 - strlen(rawbuf));
 	return (rawbuf);
 }
 
@@ -636,7 +633,7 @@
 				err(1, NULL);
 			nargv[0][0] = '-';
 			nargv[0][1] = *ap;
-			(void)strcpy(&nargv[0][2], *argv);
+			strlcpy(&nargv[0][2], *argv, strlen(*argv) + 1);
 			++argv;
 			++nargv;
 			break;