diff --git a/lib/libarchive/archive_entry.3 b/lib/libarchive/archive_entry.3
index e02e1c073d7..b6195775b8b 100644
--- a/lib/libarchive/archive_entry.3
+++ b/lib/libarchive/archive_entry.3
@@ -99,15 +99,15 @@
 .Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name"
 .Ft int
 .Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name"
-.Ft void
-.Fn archive_entry_acl_reset "struct archive_entry *"
+.Ft int
+.Fn archive_entry_acl_reset "struct archive_entry *" "int want_type"
 .Ft const wchar_t *
 .Fn archive_entry_acl_text_w "struct archive_entry *" "int flags"
 .Ft time_t
 .Fn archive_entry_atime "struct archive_entry *"
 .Ft long
 .Fn archive_entry_atime_nsec "struct archive_entry *"
-.Ft void
+.Ft "struct archive_entry *"
 .Fn archive_entry_clear "struct archive_entry *"
 .Ft struct archive_entry *
 .Fn archive_entry_clone "struct archive_entry *"
@@ -122,7 +122,7 @@
 .Ft void
 .Fn archive_entry_copy_pathname_w "struct archive_entry *" "const wchar_t *"
 .Ft void
-.Fn archive_entry_copy_stat "struct archive_entry *" "struct stat *"
+.Fn archive_entry_copy_stat "struct archive_entry *" "const struct stat *"
 .Ft void
 .Fn archive_entry_copy_symlink_w "struct archive_entry *" "const wchar_t *"
 .Ft void
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index ed04ae0accf..1575c7bf9a6 100644
--- a/lib/libarchive/archive_read.3
+++ b/lib/libarchive/archive_read.3
@@ -81,7 +81,7 @@
 .Ft int
 .Fn archive_read_support_format_zip "struct archive *"
 .Ft int
-.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *"
+.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *"
 .Ft int
 .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size"
 .Ft int
@@ -95,7 +95,7 @@
 .Ft int
 .Fn archive_read_data_skip "struct archive *"
 .Ft int
-.Fn archive_read_data_into_buffer "struct archive *" "void *" "size_t len"
+.Fn archive_read_data_into_buffer "struct archive *" "void *" "ssize_t len"
 .Ft int
 .Fn archive_read_data_into_fd "struct archive *" "int fd"
 .Ft int
diff --git a/lib/libarchive/archive_util.3 b/lib/libarchive/archive_util.3
index 84589b8832a..4646ac93343 100644
--- a/lib/libarchive/archive_util.3
+++ b/lib/libarchive/archive_util.3
@@ -50,7 +50,7 @@
 .Fn archive_format "struct archive *"
 .Ft const char *
 .Fn archive_format_name "struct archive *"
-.Ft int
+.Ft void
 .Fn archive_set_error "struct archive *" "int error_code" "const char *fmt" "..."
 .Sh DESCRIPTION
 These functions provide access to various information about the
diff --git a/lib/libarchive/archive_write.3 b/lib/libarchive/archive_write.3
index 20864242b68..f32bfcb877e 100644
--- a/lib/libarchive/archive_write.3
+++ b/lib/libarchive/archive_write.3
@@ -53,9 +53,9 @@
 .Ft struct archive *
 .Fn archive_write_new "void"
 .Ft int
-.Fn archive_write_set_bytes_per_block "archive *" "int bytes_per_block"
+.Fn archive_write_set_bytes_per_block "struct archive *" "int bytes_per_block"
 .Ft int
-.Fn archive_write_set_bytes_in_last_block "archive *" "int"
+.Fn archive_write_set_bytes_in_last_block "struct archive *" "int"
 .Ft int
 .Fn archive_write_set_compressor_gzip "struct archive *"
 .Ft int
@@ -73,13 +73,13 @@
 .Ft int
 .Fn archive_write_set_format_ustar "struct archive *"
 .Ft int
-.Fn archive_write_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_write_archive_callback *" "archive_close_archive_callback *"
+.Fn archive_write_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_write_callback *" "archive_close_callback *"
 .Ft int
 .Fn archive_write_open_fd "struct archive *" "int fd"
 .Ft int
 .Fn archive_write_open_file "struct archive *" "const char *filename"
 .Ft int
-.Fn archive_write_header "struct archive *"
+.Fn archive_write_header "struct archive *" "struct archive_entry *"
 .Ft int
 .Fn archive_write_data "struct archive *" "const void *" "size_t"
 .Ft int
@@ -215,7 +215,7 @@ These functions are registered by calling
 .Bl -item -offset indent
 .It
 .Ft typedef int
-.Fn archive_open_archive_callback "struct archive *" "void *client_data"
+.Fn archive_open_callback "struct archive *" "void *client_data"
 .El
 .Pp
 The open callback is invoked by
@@ -231,7 +231,7 @@ to register an error code and message and return
 .Bl -item -offset indent
 .It
 .Ft typedef ssize_t
-.Fn archive_write_archive_callback "struct archive *" "void *client_data" "void *buffer" "size_t length"
+.Fn archive_write_callback "struct archive *" "void *client_data" "void *buffer" "size_t length"
 .El
 .Pp
 The write callback is invoked whenever the library
@@ -249,7 +249,7 @@ to register an error code and message and return -1.
 .Bl -item -offset indent
 .It
 .Ft typedef int
-.Fn archive_close_archive_callback "struct archive *" "void *client_data"
+.Fn archive_close_callback "struct archive *" "void *client_data"
 .El
 .Pp
 The close callback is invoked by archive_close when