diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index fc4330c665f..b3867eead43 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/19 21:04:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2010/10/30 17:27:03 naddy Exp $
 
 COMMENT=	library for reading and writing streaming archives
 
 DISTNAME=	libarchive-2.8.4
+REVISION=	0
 SHARED_LIBS=	archive		6.0	# .10.3
 CATEGORIES=	archivers
 HOMEPAGE=	http://code.google.com/p/libarchive/
diff --git a/archivers/libarchive/patches/patch-Makefile_in b/archivers/libarchive/patches/patch-Makefile_in
deleted file mode 100644
index be806c3c4db..00000000000
--- a/archivers/libarchive/patches/patch-Makefile_in
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2010/09/13 17:10:31 naddy Exp $
-
-Our groff is too old.  We need to pre-format the man pages with mandoc.
-
---- Makefile.in.orig	Wed Jun 30 11:54:48 2010
-+++ Makefile.in	Mon Sep 13 18:04:52 2010
-@@ -7074,3 +7074,19 @@ cpio/test/list.h: Makefile
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+.for s in 1 3 5
-+.SUFFIXES: .0 .$s
-+.$s.0:
-+	mandoc $< >$@
-+
-+install-man: install-cat$s
-+install-cat$s:
-+	@for file in ${man_MANS:M*.$s:R:=.0}; do \
-+	    $(MKDIR_P) "$(DESTDIR)$(mandir)/cat$s" ; \
-+	    echo "$(INSTALL_DATA) '$$file' '$(DESTDIR)$(mandir)/cat$s/'"; \
-+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(mandir)/cat$s/"; \
-+	done
-+.endfor
-+
-+all-am: ${man_MANS:R:=.0}
diff --git a/archivers/libarchive/pkg/PLIST b/archivers/libarchive/pkg/PLIST
index 4f8048a2f2a..1c4673f42a7 100644
--- a/archivers/libarchive/pkg/PLIST
+++ b/archivers/libarchive/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/04/05 11:36:55 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2010/10/30 17:27:04 naddy Exp $
 %%SHARED%%
 @bin bin/bsdcpio
 @bin bin/bsdtar
@@ -8,31 +8,17 @@ lib/libarchive.a
 lib/libarchive.la
 lib/pkgconfig/
 lib/pkgconfig/libarchive.pc
-@man man/cat1/bsdcpio.0
-@man man/cat1/bsdtar.0
-@man man/cat3/archive_entry.0
-@man man/cat3/archive_read.0
-@man man/cat3/archive_read_disk.0
-@man man/cat3/archive_util.0
-@man man/cat3/archive_write.0
-@man man/cat3/archive_write_disk.0
-@man man/cat3/libarchive.0
-@man man/cat3/libarchive_internals.0
-@man man/cat5/cpio.0
-@man man/cat5/libarchive-formats.0
-@man man/cat5/mtree.0
-@man man/cat5/tar.0
-@comment @man man/man1/bsdcpio.1
-@comment @man man/man1/bsdtar.1
-@comment @man man/man3/archive_entry.3
-@comment @man man/man3/archive_read.3
-@comment @man man/man3/archive_read_disk.3
-@comment @man man/man3/archive_util.3
-@comment @man man/man3/archive_write.3
-@comment @man man/man3/archive_write_disk.3
-@comment @man man/man3/libarchive.3
-@comment @man man/man3/libarchive_internals.3
-@comment @man man/man5/cpio.5
-@comment @man man/man5/libarchive-formats.5
-@comment @man man/man5/mtree.5
-@comment @man man/man5/tar.5
+@man man/man1/bsdcpio.1
+@man man/man1/bsdtar.1
+@man man/man3/archive_entry.3
+@man man/man3/archive_read.3
+@man man/man3/archive_read_disk.3
+@man man/man3/archive_util.3
+@man man/man3/archive_write.3
+@man man/man3/archive_write_disk.3
+@man man/man3/libarchive.3
+@man man/man3/libarchive_internals.3
+@man man/man5/cpio.5
+@man man/man5/libarchive-formats.5
+@man man/man5/mtree.5
+@man man/man5/tar.5