regen
diff --git a/man/zip_get_archive_comment.man b/man/zip_get_archive_comment.man
index e9bf825..93b8009 100644
--- a/man/zip_get_archive_comment.man
+++ b/man/zip_get_archive_comment.man
@@ -1,5 +1,5 @@
 .\" zip_get_archive_comment.mdoc \-- get zip archive comment
-.\" Copyright (C) 2006 Dieter Baron and Thomas Klausner
+.\" Copyright (C) 2006-2012 Dieter Baron and Thomas Klausner
 .\"
 .\" This file is part of libzip, a library to manipulate ZIP archives.
 .\" The authors can be contacted at <libzip@nih.at>
@@ -29,7 +29,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH ZIP_GET_ARCHIVE_COMMENT 3 "April 23, 2006" NiH
+.TH ZIP_GET_ARCHIVE_COMMENT 3 "February 20, 2012" NiH
 .SH "NAME"
 zip_get_archive_comment \- get zip archive comment
 .SH "LIBRARY"
@@ -43,9 +43,15 @@
 The
 zip_get_archive_comment
 function returns the comment for the entire zip archive.
+The name is in UTF-8 encoding unless
+\fBZIP_FL_NAME_RAW\fR
+was specified (see below).
 This pointer should not be modified or
 free(3)
-Ap d.
+Ap d,
+and becomes invalid when
+\fBarchive\fR
+is closed.
 If
 \fBlenp\fR
 is not
@@ -57,6 +63,24 @@
 is set to
 \fBZIP_FL_UNCHANGED,\fR
 the original unchanged comment is returned.
+.PP
+Additionally, the following flags are supported:
+.RS
+.TP 22
+\fBZIP_FL_NAME_RAW\fR
+Return the unmodified archive comment as it is in the ZIP archive.
+.TP 22
+\fBZIP_FL_NAME_GUESS\fR
+(Default.)
+Guess the encoding of the archive comment in the ZIP archive and convert it
+to UTF-8, if necessary.
+.TP 22
+\fBZIP_FL_NAME_STRICT\fR
+Follow the ZIP specification for file names and extend it to the archive comment,
+thus also expecting it in CP-437 encoding.
+(ASCII is a subset of CP-437.)
+Convert it to UTF-8.
+.RE
 .SH "RETURN VALUES"
 Upon successful completion, a pointer to the comment is returned,
 or
diff --git a/man/zip_set_archive_comment.man b/man/zip_set_archive_comment.man
index efa3e75..d30ee4a 100644
--- a/man/zip_set_archive_comment.man
+++ b/man/zip_set_archive_comment.man
@@ -1,5 +1,5 @@
 .\" zip_set_archive_comment.mdoc \-- set zip archive comment
-.\" Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
+.\" Copyright (C) 2006-2012 Dieter Baron and Thomas Klausner
 .\"
 .\" This file is part of libzip, a library to manipulate ZIP archives.
 .\" The authors can be contacted at <libzip@nih.at>
@@ -29,7 +29,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH ZIP_SET_ARCHIVE_COMMENT 3 "October 26, 2007" NiH
+.TH ZIP_SET_ARCHIVE_COMMENT 3 "February 20, 2012" NiH
 .SH "NAME"
 zip_set_archive_comment \- set zip archive comment
 .SH "LIBRARY"
@@ -51,6 +51,8 @@
 and
 \fBlen\fR
 is 0, the archive comment will be removed.
+\fBcomment\fR
+must be encoded in ASCII or UTF-8.
 .SH "RETURN VALUES"
 Upon successful completion 0 is returned.
 Otherwise, \-1 is returned and the error information in
@@ -64,7 +66,9 @@
 [ZIP_ER_INVAL]
 \fBlen\fR
 is less than 0 or longer than the maximum comment length in a zip file
-(65535).
+(65535), or
+\fBcomment\fR
+is not a valid UTF-8 encoded string.
 .TP 4
 [ZIP_ER_MEMORY]
 Required memory could not be allocated.
diff --git a/man/zip_set_file_comment.man b/man/zip_set_file_comment.man
index 41eed36..a8dc722 100644
--- a/man/zip_set_file_comment.man
+++ b/man/zip_set_file_comment.man
@@ -1,5 +1,5 @@
 .\" zip_set_file_comment.mdoc \-- set comment for file in zip
-.\" Copyright (C) 2006-2009 Dieter Baron and Thomas Klausner
+.\" Copyright (C) 2006-2012 Dieter Baron and Thomas Klausner
 .\"
 .\" This file is part of libzip, a library to manipulate ZIP files.
 .\" The authors can be contacted at <libzip@nih.at>
@@ -29,7 +29,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.TH ZIP_SET_FILE_COMMENT 3 "March 10, 2009" NiH
+.TH ZIP_SET_FILE_COMMENT 3 "February 20, 2012" NiH
 .SH "NAME"
 zip_set_file_comment \- set comment for file in zip
 .SH "LIBRARY"
@@ -56,6 +56,8 @@
 and
 \fBlen\fR
 is 0, the file comment will be removed.
+\fBcomment\fR
+must be encoded in ASCII or UTF-8.
 .SH "RETURN VALUES"
 Upon successful completion 0 is returned.
 Otherwise, \-1 is returned and the error information in
@@ -66,6 +68,11 @@
 fails if:
 .RS
 .TP 4
+[ZIP_ER_ENCMISMATCH]
+The file name is encoded in CP437 and the file comment is in UTF-8.
+Workaround: see
+zip_rename(3).
+.TP 4
 [ZIP_ER_INVAL]
 \fBindex\fR
 is not a valid file index in
@@ -73,7 +80,9 @@
 or
 \fBlen\fR
 is less than 0 or longer than the maximum comment length in a zip file
-(65535).
+(65535), or
+\fBcomment\fR
+is not a valid UTF-8 encoded string.
 .TP 4
 [ZIP_ER_MEMORY]
 Required memory could not be allocated.