diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index ede11c03c22a..c2ad2ab39f43 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=		copytape
 PORTVERSION=		1.0
-PORTREVISION=	1
+PORTREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		COMP_SOURCES/unix/volume10
 DISTNAME=		copytape
 EXTRACT_SUFX=		.Z
 
 MAINTAINER=		sjroz@verizon.net
 COMMENT=		Program that is used to duplicate magtapes
 
 EXTRACT_DEPENDS=	gunshar:archivers/sharutils
 
 NO_WRKSUBDIR=		yes
 
 EXTRACT_CMD=		zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| gunshar -d ${WRKSRC}
 
 CFLAGS+=	-Wno-return-type
 # XXX upstream puts CFLAGS in CC
 MAKE_ARGS+=	CC="${CC} ${CFLAGS}"
 ALL_TARGET=	copytape
 
 PLIST_FILES=	bin/copytape \
 		share/man/man1/copytape.1.gz \
 		share/man/man5/copytape.5.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/copytape ${STAGEDIR}${PREFIX}/bin/copytape
 	${INSTALL_MAN} ${WRKSRC}/copytape.1 ${STAGEDIR}${PREFIX}/share/man/man1/copytape.1
 	${INSTALL_MAN} ${WRKSRC}/copytape.5 ${STAGEDIR}${PREFIX}/share/man/man5/copytape.5
 
 .include <bsd.port.mk>
diff --git a/sysutils/copytape/files/patch-copytape.c_1 b/sysutils/copytape/files/patch-copytape.c
similarity index 59%
rename from sysutils/copytape/files/patch-copytape.c_1
rename to sysutils/copytape/files/patch-copytape.c
index 0be1bdc8d526..8dc9a0708c88 100644
--- a/sysutils/copytape/files/patch-copytape.c_1
+++ b/sysutils/copytape/files/patch-copytape.c
@@ -1,20 +1,33 @@
---- copytape.c.orig	Fri Oct 23 17:23:06 1998
-+++ copytape.c	Fri Oct 23 17:23:46 1998
-@@ -36,7 +36,7 @@
+--- copytape.c.orig
++++ copytape.c
+@@ -28,15 +28,18 @@
+  */
  
- extern int      errno;
+ 
+-#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/mtio.h>
+ #include <sys/file.h>
+ 
+-extern int      errno;
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
  
 -#define BUFLEN		262144	/* max tape block size */
 +#define BUFLEN		(1024*1024)	/* max tape block size */
  #define TAPE_MARK	-100	/* return record length if we read a
  				 * tape mark */
  #define END_OF_TAPE	-101	/* 2 consecutive tape marks */
-@@ -149,7 +149,7 @@
+@@ -149,7 +152,7 @@
  	    len = input(from);
  	} while (len > 0);
  	if (len == FORMAT_ERROR) {
 -	    perror(stderr, "copytape: format error on skip");
 +	    perror("copytape: format error on skip");
  	    exit(-1);
  	};
  	if (len == END_OF_TAPE) {
diff --git a/sysutils/copytape/files/patch-copytape.c_2 b/sysutils/copytape/files/patch-copytape.c_2
deleted file mode 100644
index 8838843a4939..000000000000
--- a/sysutils/copytape/files/patch-copytape.c_2
+++ /dev/null
@@ -1,11 +0,0 @@
---- copytape.c.orig    2013-10-16 06:54:00.000000000 -0400
-+++ copytape.c 2013-10-16 06:54:13.000000000 -0400
-@@ -29,6 +29,8 @@
-
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/mtio.h>