diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index 3b8a775921ea..d19ed73b24fa 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sharutils
-PORTVERSION=	4.3.77
-PORTREVISION=	1
+PORTVERSION=	4.3.80
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME}/REL-${PORTVERSION}
 
 MAINTAINER=	sylvioc@gmail.com
 COMMENT=	Pack, send and unpack shell archives; synchronize via e-mail
@@ -38,5 +37,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@SH@|${SH}|' \
 		${WRKSRC}/src/mail-files.in ${WRKSRC}/src/mailshar.in
 	@${REINPLACE_CMD} -e 's|@PERL@|${PERL}|' ${WRKSRC}/src/remsync.in
+	@${FIND} ${WRKSRC} -name \*.c  -or -name \*.h | ${XARGS} \
+		${REINPLACE_CMD} -e 's|uintmax_t|unsigned long long|;s|intmax_t|long long|'
 
 .include <bsd.port.mk>
diff --git a/archivers/sharutils/distinfo b/archivers/sharutils/distinfo
index d84d08feb9c8..ba34a0d83b11 100644
--- a/archivers/sharutils/distinfo
+++ b/archivers/sharutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (sharutils-4.3.77.tar.gz) = 813e7d2d119fc807286b1e01448cf450
-SIZE (sharutils-4.3.77.tar.gz) = 686211
+MD5 (sharutils-4.3.80.tar.gz) = 1a9e41753998cb20cfa4484ed21d7fc9
+SIZE (sharutils-4.3.80.tar.gz) = 799351
diff --git a/archivers/sharutils/files/patch-src_unshar.c b/archivers/sharutils/files/patch-src_unshar.c
deleted file mode 100644
index 9180a07812dc..000000000000
--- a/archivers/sharutils/files/patch-src_unshar.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/unshar.c.orig	1995-11-21 17:22:14.000000000 +0100
-+++ src/unshar.c	2004-09-29 15:09:44.682469264 +0200
-@@ -346,8 +346,8 @@
- {
-   size_t size_read;
-   FILE *file;
--  char name_buffer[NAME_BUFFER_SIZE];
--  char copy_buffer[NAME_BUFFER_SIZE];
-+  char name_buffer[NAME_BUFFER_SIZE] = {'\0'};
-+  char copy_buffer[NAME_BUFFER_SIZE] = {'\0'};
-   int optchar;
- 
-   program_name = argv[0];
-@@ -409,14 +409,14 @@
-   if (optind < argc)
-     for (; optind < argc; optind++)
-       {
--	if (argv[optind][0] == '/')
--	  stpcpy (name_buffer, argv[optind]);
--	else
--	  {
--	    char *cp = stpcpy (name_buffer, current_directory);
--	    *cp++ = '/';
--	    stpcpy (cp, argv[optind]);
--	  }
-+	if (argv[optind][0] == '/') {
-+		strncpy (name_buffer, argv[optind], sizeof(name_buffer));
-+		name_buffer[sizeof(name_buffer)-1] = '\0';
-+	}
-+	else {
-+		snprintf(name_buffer, sizeof(name_buffer),"%s/%s", current_directory, argv[optind]);
-+		name_buffer[sizeof(name_buffer)-1] = '\0';
-+	}
- 	if (file = fopen (name_buffer, "r"), !file)
- 	  error (EXIT_FAILURE, errno, name_buffer);
- 	unarchive_shar_file (name_buffer, file);