diff --git a/archivers/gshar+gunshar/patches/patch-doc_Makefile_in b/archivers/gshar+gunshar/patches/patch-doc_Makefile_in
index b705a4d38b7..901bc1ec783 100644
--- a/archivers/gshar+gunshar/patches/patch-doc_Makefile_in
+++ b/archivers/gshar+gunshar/patches/patch-doc_Makefile_in
@@ -1,6 +1,7 @@
---- doc/Makefile.in.orig	Fri Nov 24 21:44:35 1995
-+++ doc/Makefile.in	Tue Dec 28 18:44:07 1999
-@@ -26,7 +26,7 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.2 2004/04/10 20:28:00 naddy Exp $
+--- doc/Makefile.in.orig	1995-11-25 03:44:35.000000000 +0100
++++ doc/Makefile.in	2004-04-10 22:21:45.000000000 +0200
+@@ -26,7 +26,7 @@ VPATH = @srcdir@
  transform = @program_transform_name@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
@@ -9,7 +10,7 @@
  TEXI2DVI = texi2dvi
  TOUCH = echo timestamp >
  
-@@ -52,9 +52,11 @@
+@@ -52,9 +52,11 @@ default: all
  all info check: sharutils.info remsync.info
  
  sharutils.info: sharutils.texi version.texi
@@ -21,7 +22,7 @@
  	cd $(srcdir) && $(MAKEINFO) remsync.texi
  
  dvi: sharutils.dvi remsync.dvi
-@@ -79,7 +81,7 @@
+@@ -79,7 +81,7 @@ stamp-vti: sharutils.texi $(top_srcdir)/
  	$(TOUCH) $(srcdir)/stamp-vti
  
  install install-exec install-data: all
diff --git a/archivers/gshar+gunshar/patches/patch-doc_remsync_texi b/archivers/gshar+gunshar/patches/patch-doc_remsync_texi
index 2f5cce3a1fc..60681ed470a 100644
--- a/archivers/gshar+gunshar/patches/patch-doc_remsync_texi
+++ b/archivers/gshar+gunshar/patches/patch-doc_remsync_texi
@@ -1,3 +1,4 @@
+$OpenBSD: patch-doc_remsync_texi,v 1.2 2004/04/10 20:28:00 naddy Exp $
 --- doc/remsync.texi.orig	Thu Nov 30 18:15:37 1995
 +++ doc/remsync.texi	Tue Dec 14 22:37:13 1999
 @@ -2,6 +2,11 @@
diff --git a/archivers/gshar+gunshar/patches/patch-doc_sharutils_texi b/archivers/gshar+gunshar/patches/patch-doc_sharutils_texi
index 596235d5139..2f16a3282f9 100644
--- a/archivers/gshar+gunshar/patches/patch-doc_sharutils_texi
+++ b/archivers/gshar+gunshar/patches/patch-doc_sharutils_texi
@@ -1,5 +1,6 @@
---- doc/sharutils.texi.orig	Fri Nov 24 21:42:52 1995
-+++ doc/sharutils.texi	Tue Dec 14 22:37:13 1999
+$OpenBSD: patch-doc_sharutils_texi,v 1.2 2004/04/10 20:28:00 naddy Exp $
+--- doc/sharutils.texi.orig	1995-11-25 03:42:52.000000000 +0100
++++ doc/sharutils.texi	2004-04-10 22:21:45.000000000 +0200
 @@ -2,6 +2,16 @@
  @c %**start of header
  @setfilename sharutils.info
@@ -39,7 +40,7 @@
  This file documents the GNU set of shar utilities.
  
  Copyright (C) 1994 Free Software Foundation, Inc.
-@@ -157,8 +152,8 @@
+@@ -157,8 +152,8 @@ for these programs to @file{bug-gnu-util
  The format of the @code{shar} command is one of:
  
  @example
@@ -50,7 +51,7 @@
  @end example
  
  In the first form, the file list is given as command arguments.  In the
-@@ -548,7 +543,7 @@
+@@ -548,7 +543,7 @@ restored whether @code{-f} is specified 
  The format of the @code{unshar} command is:
  
  @example
@@ -59,7 +60,7 @@
  @end example
  
  Each @var{file} is processed in turn, as a shell archive or a
-@@ -635,10 +630,10 @@
+@@ -635,10 +630,10 @@ archive process considerably.
  Let us conclude by a showing a few examples of @code{shar} usage:
  
  @example
diff --git a/archivers/gshar+gunshar/patches/patch-src_shar_c b/archivers/gshar+gunshar/patches/patch-src_shar_c
index d0e766f26c7..a73a9db07ee 100644
--- a/archivers/gshar+gunshar/patches/patch-src_shar_c
+++ b/archivers/gshar+gunshar/patches/patch-src_shar_c
@@ -1,6 +1,7 @@
---- src/shar.c.orig	Fri Sep 10 15:20:41 1999
-+++ src/shar.c	Sat Aug 19 19:54:56 2000
-@@ -696,7 +696,7 @@
+$OpenBSD: patch-src_shar_c,v 1.2 2004/04/10 20:28:00 naddy Exp $
+--- src/shar.c.orig	1999-09-10 21:20:41.000000000 +0200
++++ src/shar.c	2004-04-10 22:23:15.000000000 +0200
+@@ -696,7 +696,7 @@ generate_one_header_line (local_name, re
       const char *local_name;
       const char *restore_name;
  {
@@ -9,3 +10,12 @@
  	   mode_string (struct_stat.st_mode), restore_name);
    return 0;
  }
+@@ -1905,7 +1905,7 @@ main (argc, argv)
+ 	break;
+ 
+       case 'o':
+-	strcpy (output_base_name, optarg);
++	strlcpy (output_base_name, optarg, sizeof(output_base_name));
+ 	if (!strchr (output_base_name, '%'))
+ 	  strcat (output_base_name, ".%02d");
+ 	part_number = 0;